diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 17:46:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 17:50:10 +0400 |
| commit | f074b67108b8f5759dbc9147d4e0bdc0cb6f3c2a (patch) | |
| tree | 9b10bb02e5182323f75e8c3b5ba551e05e4e1078 /source/blender/blenkernel/intern/dynamicpaint.c | |
| parent | c8d0d9b383a53aadc704c1619418dea8031c9abf (diff) | |
Fix T38267: dynamic paint Use Object Material not working correct in some cases.
Diffstat (limited to 'source/blender/blenkernel/intern/dynamicpaint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 5941e8b5703..5938dbec3c1 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -641,7 +641,7 @@ static int surface_getBrushFlags(DynamicPaintSurface *surface, Scene *scene) static int brush_usesMaterial(DynamicPaintBrushSettings *brush, Scene *scene) { - return ((brush->flags & MOD_DPAINT_USE_MATERIAL) && (!strcmp(scene->r.engine, "BLENDER_RENDER"))); + return ((brush->flags & MOD_DPAINT_USE_MATERIAL) && (!BKE_scene_use_new_shading_nodes(scene))); } /* check whether two bounds intersect */ |