Tamito Kajiyama ce03ec4b86 Merged changes in the trunk up to revision 38543. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

2011-07-20 23:33:10 +00:00

..

BinaryPredicate1D

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

Interface0D

Two minor fixes:

2011-02-22 01:43:08 +00:00

Interface1D

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

Iterator

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

StrokeShader

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

UnaryFunction0D

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

UnaryFunction1D

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

UnaryPredicate0D

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

UnaryPredicate1D

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

BPy_BBox.cpp

…

BPy_BBox.h

…

BPy_BinaryPredicate0D.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_BinaryPredicate0D.h

…

BPy_BinaryPredicate1D.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_BinaryPredicate1D.h

…

BPy_ContextFunctions.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_ContextFunctions.h

…

BPy_Convert.cpp

…

BPy_Convert.h

Merged changes in the trunk up to revision 38543.

2011-07-20 23:33:10 +00:00

BPy_Freestyle.cpp

Merged changes in the trunk up to revision 35367.

2011-03-06 12:13:32 +00:00

BPy_Freestyle.h

…

BPy_FrsMaterial.cpp

…

BPy_FrsMaterial.h

…

BPy_FrsNoise.cpp

…

BPy_FrsNoise.h

…

BPy_Id.cpp

…

BPy_Id.h

…

BPy_IntegrationType.cpp

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

BPy_IntegrationType.h

…

BPy_Interface0D.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_Interface0D.h

…

BPy_Interface1D.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_Interface1D.h

…

BPy_Iterator.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_Iterator.h

…

BPy_MediumType.cpp

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

BPy_MediumType.h

…

BPy_Nature.cpp

Python API documentation updates: a description of class hierarchy

2010-08-12 12:17:47 +00:00

BPy_Nature.h

…

BPy_Operators.cpp

Added Python wrappers for the following Operators static methods:

2010-12-23 09:21:41 +00:00

BPy_Operators.h

…

BPy_SShape.cpp

Made object names accessible from within style modules.

2010-05-23 17:11:44 +00:00

BPy_SShape.h

…

BPy_StrokeAttribute.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_StrokeAttribute.h

…

BPy_StrokeShader.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_StrokeShader.h

…

BPy_UnaryFunction0D.cpp

Fixed invalid use of PyUnicode_FromFormat() where PyUnicode_FromString()

2010-05-23 12:10:31 +00:00

BPy_UnaryFunction0D.h

…

BPy_UnaryFunction1D.cpp

Fixed invalid use of PyUnicode_FromFormat() where PyUnicode_FromString()

2010-05-23 12:10:31 +00:00

BPy_UnaryFunction1D.h

…

BPy_UnaryPredicate0D.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_UnaryPredicate0D.h

…

BPy_UnaryPredicate1D.cpp

Documentation updates: Replaced "string" with "str".

2010-05-28 18:42:11 +00:00

BPy_UnaryPredicate1D.h

…

BPy_ViewMap.cpp

…

BPy_ViewMap.h

…

BPy_ViewShape.cpp

Made object names accessible from within style modules.

2010-05-23 17:11:44 +00:00

BPy_ViewShape.h

…

Director.cpp

…

Director.h

…