svn merge ^/trunk/blender -r41998:42009
authorCampbell Barton <ideasman42@gmail.com>
Sun, 20 Nov 2011 16:05:51 +0000 (16:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 20 Nov 2011 16:05:51 +0000 (16:05 +0000)
commit8eb41f0fdb77062d5828dd2c3e18ffeab5fd428c
tree1b81bf423db957bf39dc01521533f8a0872842d0
parent3c8d86e117b54914524cbc49a8678ecaad8671cf
parentf1eb66aa68105ac27f371f4f708d8abf3b7da38b
svn merge ^/trunk/blender -r41998:42009
12 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_modifier.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_ocean.c