Tamito Kajiyama 70aa63306a Merged changes in the trunk up to revision 34996. ...

Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript

2011-02-19 23:51:18 +00:00

..

generic

py api was raising SystemError exception incorrectly, this is intended for internal interpreter problems.

2011-02-18 06:04:05 +00:00

intern

Merged changes in the trunk up to revision 34996.

2011-02-19 23:51:18 +00:00

BPY_extern.h

set main() argv functions to be const char *

2011-02-19 12:05:20 +00:00

CMakeLists.txt

use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.

2010-12-08 08:43:06 +00:00

rna_dump.py

mathutils.Matrix.OrthoProjection(plane, size, axis), merged axis and plane args. since axis was only allowed when plane was 'R'.

2011-02-04 09:35:20 +00:00

SConscript

* Merged changes in the trunk up to revision 31789.

2010-09-06 23:26:36 +00:00

simple_enum_gen.py

correct fsf address

2010-02-12 13:34:04 +00:00