Tamito Kajiyama c8deda3276 Merged changes in the trunk up to revision 35505. ...

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h

2011-03-13 02:10:39 +00:00

..

generic

py-api utf8/filepaths:

2011-03-08 01:28:10 +00:00

intern

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +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 35367.

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

simple_enum_gen.py

correct fsf address

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