1 files changed, 60 insertions, 49 deletions

diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index 3ab49b8773b..dd10d942fc9 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -998,55 +998,69 @@ static bool copy_to_selected_button(bContext *C, bool all, bool poll)
   UI_context_active_but_prop_get(C, &ptr, &prop, &index);
 
   /* if there is a valid property that is editable... */
-  if (ptr.data && prop) {
-    char *path = NULL;
-    bool use_path_from_id;
-    ListBase lb = {NULL};
-
-    if (UI_context_copy_to_selected_list(C, &ptr, prop, &lb, &use_path_from_id, &path) &&
-        !BLI_listbase_is_empty(&lb)) {
-      LISTBASE_FOREACH (CollectionPointerLink *, link, &lb) {
-        if (link->ptr.data != ptr.data) {
-          if (use_path_from_id) {
-            /* Path relative to ID. */
-            lprop = NULL;
-            RNA_id_pointer_create(link->ptr.owner_id, &idptr);
-            RNA_path_resolve_property(&idptr, path, &lptr, &lprop);
-          }
-          else if (path) {
-            /* Path relative to elements from list. */
-            lprop = NULL;
-            RNA_path_resolve_property(&link->ptr, path, &lptr, &lprop);
-          }
-          else {
-            lptr = link->ptr;
-            lprop = prop;
-          }
+  if (ptr.data == NULL || prop == NULL) {
+    return false;
+  }
 
-          if (lptr.data == ptr.data) {
-            /* lptr might not be the same as link->ptr! */
-            continue;
-          }
+  char *path = NULL;
+  bool use_path_from_id;
+  ListBase lb = {NULL};
 
-          if (lprop == prop) {
-            if (RNA_property_editable(&lptr, lprop)) {
-              if (poll) {
-                success = true;
-                break;
-              }
-              if (RNA_property_copy(bmain, &lptr, &ptr, prop, (all) ? -1 : index)) {
-                RNA_property_update(C, &lptr, prop);
-                success = true;
-              }
-            }
-          }
-        }
-      }
-    }
+  if (!UI_context_copy_to_selected_list(C, &ptr, prop, &lb, &use_path_from_id, &path)) {
+    return false;
+  }
+  if (BLI_listbase_is_empty(&lb)) {
     MEM_SAFE_FREE(path);
-    BLI_freelistN(&lb);
+    return false;
   }
 
+  LISTBASE_FOREACH (CollectionPointerLink *, link, &lb) {
+    if (link->ptr.data == ptr.data) {
+      continue;
+    }
+
+    if (use_path_from_id) {
+      /* Path relative to ID. */
+      lprop = NULL;
+      RNA_id_pointer_create(link->ptr.owner_id, &idptr);
+      RNA_path_resolve_property(&idptr, path, &lptr, &lprop);
+    }
+    else if (path) {
+      /* Path relative to elements from list. */
+      lprop = NULL;
+      RNA_path_resolve_property(&link->ptr, path, &lptr, &lprop);
+    }
+    else {
+      lptr = link->ptr;
+      lprop = prop;
+    }
+
+    if (lptr.data == ptr.data) {
+      /* lptr might not be the same as link->ptr! */
+      continue;
+    }
+
+    if (lprop != prop) {
+      continue;
+    }
+
+    if (!RNA_property_editable(&lptr, lprop)) {
+      continue;
+    }
+
+    if (poll) {
+      success = true;
+      break;
+    }
+    if (RNA_property_copy(bmain, &lptr, &ptr, prop, (all) ? -1 : index)) {
+      RNA_property_update(C, &lptr, prop);
+      success = true;
+    }
+  }
+
+  MEM_SAFE_FREE(path);
+  BLI_freelistN(&lb);
+
   return success;
 }
 
@@ -1557,7 +1571,7 @@ static int edittranslation_exec(bContext *C, wmOperator *op)
   }
   /* Try to find a valid po file for current language... */
   edittranslation_find_po_file(root, uilng, popath, FILE_MAX);
-  /* printf("po path: %s\n", popath); */
+  // printf("po path: %s\n", popath);
   if (popath[0] == '\0') {
     BKE_reportf(
         op->reports, RPT_ERROR, "No valid po found for language '%s' under %s", uilng, root);
@@ -1759,10 +1773,7 @@ static void UI_OT_button_string_clear(wmOperatorType *ot)
 /** \name Drop Color Operator
  * \{ */
 
-bool UI_drop_color_poll(struct bContext *C,
-                        wmDrag *drag,
-                        const wmEvent *UNUSED(event),
-                        const char **UNUSED(r_tooltip))
+bool UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(event))
 {
   /* should only return true for regions that include buttons, for now
    * return true always */