svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 12:21:41 +0000 (12:21 +0000)
committerBenoit Bolsee <benoit.bolsee@online.be>
Fri, 9 Sep 2011 12:21:41 +0000 (12:21 +0000)
commitc1c4743696c67f562eda31e90d03c72eaec04567
tree12c992e4160d7ff878f05f33549ff24b0ae3faa1
parentdbd6658d737b1592a633ddf6397be14e50e434d9
parent01744abd8187d1566b336bf38033673aa05b6786
svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender
13 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_game.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/gpu/intern/gpu_shader_material.glsl
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_Scene.cpp