Depsgraph: fix hard CTD on dependency cycles through POSE_INIT.
authorAlexander Gavrilov <angavrilov@gmail.com>
Sun, 14 Apr 2019 18:53:03 +0000 (21:53 +0300)
committerAlexander Gavrilov <angavrilov@gmail.com>
Sun, 14 Apr 2019 18:55:30 +0000 (21:55 +0300)
As reported in T63582, it can cause chan_array to be not ready.
To reliably avoid crashing, the only easy way seems to be to
create the index during COW -- maybe @sergey has a better idea.

source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/armature_update.c
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc

index 7182561..d9a1064 100644 (file)
@@ -245,6 +245,8 @@ void BKE_splineik_execute_tree(
         struct Depsgraph *depsgraph, struct Scene *scene,
         struct Object *ob, struct bPoseChannel *pchan_root, float ctime);
 
+void BKE_pose_pchan_index_rebuild(struct bPose *pose);
+
 void BKE_pose_eval_init(
         struct Depsgraph *depsgraph,
         struct Scene *scene,
index 9ba3a23..da4fea2 100644 (file)
@@ -825,6 +825,8 @@ void BKE_pose_channels_free_ex(bPose *pose, bool do_id_user)
        }
 
        BKE_pose_channels_hash_free(pose);
+
+       MEM_SAFE_FREE(pose->chan_array);
 }
 
 void BKE_pose_channels_free(bPose *pose)
index 790f5cb..892b221 100644 (file)
@@ -556,8 +556,9 @@ void BKE_splineik_execute_tree(
 
 /* *************** Depsgraph evaluation callbacks ************ */
 
-static void pose_pchan_index_create(bPose *pose)
+void BKE_pose_pchan_index_rebuild(bPose *pose)
 {
+       MEM_SAFE_FREE(pose->chan_array);
        const int num_channels = BLI_listbase_count(&pose->chanbase);
        pose->chan_array = MEM_malloc_arrayN(
                num_channels, sizeof(bPoseChannel *), "pose->chan_array");
@@ -605,7 +606,8 @@ void BKE_pose_eval_init(struct Depsgraph *depsgraph,
                }
        }
 
-       pose_pchan_index_create(pose);
+       BLI_assert(pose->chan_array != NULL || BLI_listbase_is_empty(&pose->chanbase));
+
        BKE_armature_cached_bbone_deformation_free_data(object);
 }
 
@@ -806,7 +808,6 @@ static void pose_eval_cleanup_common(Object *object)
        bPose *pose = object->pose;
        BLI_assert(pose != NULL);
        BLI_assert(pose->chan_array != NULL || BLI_listbase_is_empty(&pose->chanbase));
-       MEM_SAFE_FREE(pose->chan_array);
 }
 
 void BKE_pose_eval_done(struct Depsgraph *depsgraph, Object *object)
@@ -839,7 +840,8 @@ void BKE_pose_eval_proxy_init(struct Depsgraph *depsgraph, Object *object)
        BLI_assert(ID_IS_LINKED(object) && object->proxy_from != NULL);
        DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
 
-       pose_pchan_index_create(object->pose);
+       BLI_assert(pose->chan_array != NULL || BLI_listbase_is_empty(&pose->chanbase));
+
        BKE_armature_cached_bbone_deformation_free_data(object);
 }
 
index 0d60def..387253a 100644 (file)
@@ -697,6 +697,7 @@ void update_id_after_copy(const Depsgraph *depsgraph,
                                        update_pose_orig_pointers(object_orig->pose,
                                                                  object_cow->pose);
                                }
+                               BKE_pose_pchan_index_rebuild(object_cow->pose);
                        }
                        update_particles_after_copy(object_orig, object_cow);
                        update_modifiers_orig_pointers(object_orig, object_cow);