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)
commit2022580ce19beeab0371cd69bf696153e597895c
treede3505d9fbe721825fb2f5fc8d6382305e388ee1
parent756edb34c6e927587ba7f1aa08fb41e1b8ef6e7a
parenta2e10608626a9b3bd8a17cf4264a54ce2f03ed6f
svn merge ^/trunk/blender -r42194:42197
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/modifiers/intern/MOD_fluidsim_util.c