[Bf-blender-cvs] [53c8fd54477] master: Fix T66567: Weight painting crashes with specific mesh

Sergey Sharybin noreply at git.blender.org
Wed Jul 10 16:04:37 CEST 2019


Commit: 53c8fd54477c43fff437a57276a1ac0e2b7c7dfd
Author: Sergey Sharybin
Date:   Wed Jul 10 16:03:19 2019 +0200
Branches: master
https://developer.blender.org/rB53c8fd54477c43fff437a57276a1ac0e2b7c7dfd

Fix T66567: Weight painting crashes with specific mesh

Seems the deform group index and deform vertices went out of sync somehow.

Added extra NULL pointer check, which seems to be safe and matches checks
in other places in the neighbourhood.

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

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

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

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index df22aa1dcfb..6d855df8af7 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1370,7 +1370,11 @@ static void armature_vert_task(void *__restrict userdata,
   if (use_dverts || armature_def_nr != -1) {
     if (data->mesh) {
       BLI_assert(i < data->mesh->totvert);
-      dvert = data->mesh->dvert + i;
+      if (data->mesh->dvert != NULL) {
+        dvert = data->mesh->dvert + i;
+      } else {
+        dvert = NULL;
+      }
     }
     else if (data->dverts && i < data->target_totvert) {
       dvert = data->dverts + i;



More information about the Bf-blender-cvs mailing list