[Bf-blender-cvs] [47f3b537564] master: Fix T99742: crash when generating rigify rigs, after recent changes

Jun Mizutani noreply at git.blender.org
Mon Jul 18 14:53:40 CEST 2022


Commit: 47f3b5375648505f435f21417012ffcd78ddd923
Author: Jun Mizutani
Date:   Mon Jul 18 14:47:26 2022 +0200
Branches: master
https://developer.blender.org/rB47f3b5375648505f435f21417012ffcd78ddd923

Fix T99742: crash when generating rigify rigs, after recent changes

Differential Revision: https://developer.blender.org/D15473

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

M	source/blender/editors/armature/armature_naming.c

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

diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c
index 8d5ae6f3654..4f329dbe449 100644
--- a/source/blender/editors/armature/armature_naming.c
+++ b/source/blender/editors/armature/armature_naming.c
@@ -285,7 +285,7 @@ void ED_armature_bone_rename(Main *bmain,
       /* fix camera focus */
       if (ob->type == OB_CAMERA) {
         Camera *cam = (Camera *)ob->data;
-        if (cam->dof.focus_object->data == arm){
+        if ((cam->dof.focus_object != NULL) && (cam->dof.focus_object->data == arm)) {
           if (STREQ(cam->dof.focus_subtarget, oldname)) {
             BLI_strncpy(cam->dof.focus_subtarget, newname, MAXBONENAME);
             DEG_id_tag_update(&cam->id, ID_RECALC_COPY_ON_WRITE);



More information about the Bf-blender-cvs mailing list