Tamito Kajiyama 63b31ef91b Merged changes in the trunk up to revision 35203. ...

Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c

2011-02-26 20:21:09 +00:00

..

generic

remove warning left in by mistake and comment unused function.

2011-02-25 02:27:54 +00:00

intern

Merged changes in the trunk up to revision 35203.

2011-02-26 20:21:09 +00:00

BPY_extern.h

fix for 'live edit', running python scripts as you type

2011-02-26 15:30:38 +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