svn merge ^/trunk/blender -r42194:42197
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 Nov 2011 23:56:29 +0000 (23:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 Nov 2011 23:56:29 +0000 (23:56 +0000)
1  2 
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/modifiers/intern/MOD_fluidsim_util.c