[Bf-blender-cvs] [893c29c15ca] blender-v2.81-release: Fix T71213: Mask or Mirror before Armature breaks weight paint.

[Alexander Gavrilov]

Commit: 893c29c15ca2fd95de79e9390b5650aaeabc999f
Author: Alexander Gavrilov
Date:   Sat Nov 30 19:07:44 2019 +0300
Branches: blender-v2.81-release
https://developer.blender.org/rB893c29c15ca2fd95de79e9390b5650aaeabc999f

Fix T71213: Mask or Mirror before Armature breaks weight paint.

This is a revert of a small fraction of commit rB5e332fd700
that introduced the issue according to bisect.

Doing a break here is wrong, because BKE_crazyspace_build_sculpt
assumes that processing stopped at the first deform modifier
without deformMatrices, and thus skips all modifiers until it
finds one like that. Thus this early loop exit makes the behavior
worse, as instead of skipping just Mask and Mirror, it skips all.

===================================================================

M	source/blender/blenkernel/intern/crazyspace.c

===================================================================

diff --git a/source/blender/blenkernel/intern/crazyspace.c b/source/blender/blenkernel/intern/crazyspace.c
index f2ed84b4125..8f25feedff9 100644
--- a/source/blender/blenkernel/intern/crazyspace.c
+++ b/source/blender/blenkernel/intern/crazyspace.c
@@ -415,12 +415,12 @@ int BKE_sculpt_get_first_deform_matrices(struct Depsgraph *depsgraph,
         mti->deformMatrices(md, &mectx, me_eval, deformedVerts, defmats, me_eval->totvert);
       }
       else {
+        /* More complex handling will continue in BKE_crazyspace_build_sculpt.
+         * Exiting the loop on a non-deform modifier causes issues - T71213. */
+        BLI_assert(crazyspace_modifier_supports_deform(md));
         break;
       }
     }
-    else {
-      break;
-    }
   }
 
   for (; md; md = md->next) {