Tamito Kajiyama 329b05dcd7 Merged changes in the trunk up to revision 47381. ...

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

2012-06-03 21:11:10 +00:00

..

bmesh

style cleanup: relating to skin modifier

2012-05-22 16:09:31 +00:00

generic

BGE patch #28476: Character object physics type

2012-05-28 21:36:29 +00:00

intern

Merged changes in the trunk up to revision 47381.

2012-06-03 21:11:10 +00:00

mathutils

add vector versions of hsv_to_rgb, rgb_to_hsv & rgb_to_hsv_compat

2012-05-26 11:01:01 +00:00

BPY_extern.h

Python/context: python could get invalid bpy.data in scene update handler after

2012-05-08 22:07:06 +00:00

CMakeLists.txt

initial bmesh python api.

2012-02-22 09:19:53 +00:00

rna_dump.py

Code Cleanup: check is / is not when comparing singletons.

2012-02-02 21:07:56 +00:00

SConscript

Merged changes in the trunk up to revision 46557.

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

simple_enum_gen.py

style cleanup: py/capi

2012-03-16 21:39:56 +00:00