Tamito Kajiyama 7fa096261a Merged changes in the trunk up to revision 52118. ...

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c

2012-11-12 00:30:55 +00:00

..

bmesh

use min/max inline functions where MIN2/MAX2 were doing type conversion.

2012-10-27 11:18:54 +00:00

generic

style cleanup: indentation

2012-11-09 09:33:28 +00:00

intern

Merged changes in the trunk up to revision 51985.

2012-11-07 22:12:19 +00:00

mathutils

default to Python3.3 on Linux for SCons and CMake, warn when building with python 3.2x or older.

2012-11-05 13:48:42 +00:00

BPY_extern.h

fix [#31661] Custom properties do no respect min/max values

2012-10-26 10:54:02 +00:00

CMakeLists.txt

…

rna_dump.py

style cleanup: pep8

2012-10-08 10:03:01 +00:00

SConscript

Merged changes in the trunk up to revision 46557.

2012-05-11 22:48:41 +00:00

simple_enum_gen.py

…