Tamito Kajiyama 3789c398ff Merged changes in the trunk up to revision 34828. ...

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

2011-02-13 23:47:30 +00:00

..

generic

fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions.

2011-02-13 10:52:18 +00:00

intern

Merged changes in the trunk up to revision 34828.

2011-02-13 23:47:30 +00:00

BPY_extern.h

edits for BPY_extern.h functions, no functional changes

2011-01-05 02:08: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 31789.

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

simple_enum_gen.py

correct fsf address

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