1 files changed, 16 insertions, 2 deletions

diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c
index 1f02e24666d..26ec05cc503 100644
--- a/source/blender/editors/armature/armature_naming.c
+++ b/source/blender/editors/armature/armature_naming.c
@@ -13,6 +13,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_armature_types.h"
+#include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_gpencil_modifier_types.h"
 #include "DNA_gpencil_types.h"
@@ -281,6 +282,17 @@ 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 != 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);
+          }
+        }
+      }
+
       /* fix grease pencil modifiers and vertex groups */
       if (ob->type == OB_GPENCIL) {
 
@@ -417,6 +429,7 @@ void ED_armature_bones_flip_names(Main *bmain,
 static int armature_flip_names_exec(bContext *C, wmOperator *op)
 {
   Main *bmain = CTX_data_main(C);
+  const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   Object *ob_active = CTX_data_edit_object(C);
 
@@ -424,7 +437,7 @@ static int armature_flip_names_exec(bContext *C, wmOperator *op)
 
   uint objects_len = 0;
   Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
-      view_layer, CTX_wm_view3d(C), &objects_len);
+      scene, view_layer, CTX_wm_view3d(C), &objects_len);
   for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
     Object *ob = objects[ob_index];
     bArmature *arm = ob->data;
@@ -504,6 +517,7 @@ void ARMATURE_OT_flip_names(wmOperatorType *ot)
 
 static int armature_autoside_names_exec(bContext *C, wmOperator *op)
 {
+  const Scene *scene = CTX_data_scene(C);
   ViewLayer *view_layer = CTX_data_view_layer(C);
   Main *bmain = CTX_data_main(C);
   char newname[MAXBONENAME];
@@ -512,7 +526,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op)
 
   uint objects_len = 0;
   Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(
-      view_layer, CTX_wm_view3d(C), &objects_len);
+      scene, view_layer, CTX_wm_view3d(C), &objects_len);
   for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
     Object *ob = objects[ob_index];
     bArmature *arm = ob->data;