Blender Git Loki

/source/blender/blenkernel/BKE_collision.h (+11, -0) (Diff)
/source/blender/blenkernel/BKE_effect.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/collision.c (+40, -28) (Diff)
/source/blender/blenkernel/intern/effect.c (+63, -10) (Diff)
/source/blender/blenkernel/intern/implicit.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/modifier.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+2, -1) (Diff)
/source/blender/python/api2_2x/doc/Material.py (+17, -2) (Diff)
/source/blender/python/api2_2x/doc/Text3d.py (+20, -0) (Diff)
/source/blender/python/api2_2x/Material.c (+88, -4) (Diff)
/source/blender/python/api2_2x/Text3d.c (+46, -0) (Diff)
/source/blender/src/buttons_object.c (+12, -4) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+1, -24) (Diff)