Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-11-19 00:41:11 +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: comments & spelling

2012-11-18 01:22:31 +00:00

intern

Merged changes in the trunk up to revision 51985.

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

mathutils

code cleanup: spelling,

2012-11-12 07:33:01 +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

…

simple_enum_gen.py

…