Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / dynamicpaint.c
index 1d198e36e058d9d2439bcb34272d4bc48a178818..1e8d0f0d767a56b3b17aa1cec8047e68f77f436b 100644 (file)
@@ -5562,8 +5562,6 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su
                                                dynamicPaint_updateBrushMaterials(brushObj, brush->mat, scene, &bMats);
 
                                        /* Apply brush on the surface depending on it's collision type */
-                                       /* Particle brush: */
-                                       if (brush->collision == MOD_DPAINT_COL_PSYS) {
                                                if (brush->psys && brush->psys->part &&
                                                    ELEM(brush->psys->part->type, PART_EMITTER, PART_FLUID) &&
                                                    psys_check_enabled(brushObj, brush->psys, G.is_rendering))
@@ -5573,9 +5571,8 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su
                                                                                      BKE_scene_frame_get(scene), ADT_RECALC_ANIM);
                                                        dynamicPaint_paintParticles(surface, brush->psys, brush, timescale);
                                                }
-                                       }
                                        /* Object center distance: */
-                                       else if (brush->collision == MOD_DPAINT_COL_POINT && brushObj != ob) {
+                                       if (brush->collision == MOD_DPAINT_COL_POINT && brushObj != ob) {
                                                dynamicPaint_paintSinglePoint(surface, brushObj->loc, brush, brushObj, &bMats, scene, timescale);
                                        }
                                        /* Mesh volume/proximity: */