[Bf-blender-cvs] [fb62fcf0717] master: Fix polling function for background image removal not checking linked ID.

Bastien Montagne noreply at git.blender.org
Mon May 30 16:58:57 CEST 2022


Commit: fb62fcf0717e5a3e6ef464e12cbdbd21e91533a0
Author: Bastien Montagne
Date:   Mon May 30 16:22:06 2022 +0200
Branches: master
https://developer.blender.org/rBfb62fcf0717e5a3e6ef464e12cbdbd21e91533a0

Fix polling function for background image removal not checking linked ID.

Linked ID is (almost) never editable... Also rename that function to add
the `_poll` suffix.

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

M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/screen/screen_ops.c
M	source/blender/editors/space_view3d/view3d_edit.c

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

diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index f909a13c2cb..aa62a6209e4 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -596,7 +596,7 @@ bool ED_operator_posemode_context(struct bContext *C);
 bool ED_operator_posemode(struct bContext *C);
 bool ED_operator_posemode_local(struct bContext *C);
 bool ED_operator_mask(struct bContext *C);
-bool ED_operator_camera(struct bContext *C);
+bool ED_operator_camera_poll(struct bContext *C);
 
 /* screen_user_menu.c */
 
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index d7cf09ca89a..a922e5aaaee 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -685,10 +685,10 @@ bool ED_operator_mask(bContext *C)
   return false;
 }
 
-bool ED_operator_camera(bContext *C)
+bool ED_operator_camera_poll(bContext *C)
 {
   struct Camera *cam = CTX_data_pointer_get_type(C, "camera", &RNA_Camera).data;
-  return (cam != NULL);
+  return (cam != NULL && !ID_IS_LINKED(cam));
 }
 
 /** \} */
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 922ebe2f0f4..fb5e7e58d33 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -653,7 +653,7 @@ void VIEW3D_OT_background_image_remove(wmOperatorType *ot)
 
   /* api callbacks */
   ot->exec = background_image_remove_exec;
-  ot->poll = ED_operator_camera;
+  ot->poll = ED_operator_camera_poll;
 
   /* flags */
   ot->flag = 0;



More information about the Bf-blender-cvs mailing list