Tamito Kajiyama 003ab20292 Merged changes in the trunk up to revision 35618. ...

Conflicts resolved:
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_main_api.c

2011-03-19 00:05:30 +00:00

..

blender-org

== python api doc ==

2010-10-13 10:42:33 +00:00

epy

removing epydocs for mathutils and geometry mododules (now they are in sphinx)

2011-01-01 23:53:48 +00:00

examples

add sphinx api reference note that menu's layout.operator_context defaults to EXEC_REGION_WIN rather then INVOKE_DEFAULT.

2011-03-17 22:49:46 +00:00

rst

remove BGE's PyObjectPlus.isA method docs, was removed in favor of built-in isinstance(), report [#26080].

2011-02-21 10:15:19 +00:00

sphinx_doc_gen.py

Merged changes in the trunk up to revision 35618.

2011-03-19 00:05:30 +00:00

sphinx_doc_gen.sh

- cmake was missing an inclide (IDE's wouldnt index)

2011-02-06 10:18:20 +00:00