Tamito Kajiyama 3df52d4e19 Merged changes in the trunk up to revision 36092. ...

Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c

2011-04-11 00:09:56 +00:00

..

generic

add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library.

2011-04-05 23:31:01 +00:00

intern

Merged changes in the trunk up to revision 36092.

2011-04-11 00:09:56 +00:00

BPY_extern.h

Py/RNA API test code to prevent crashing blender when python references freed ID's.

2011-03-01 09:02:54 +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 35972.

2011-04-03 12:46:33 +00:00

simple_enum_gen.py

correct fsf address

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