[Bf-blender-cvs] [9cf25b9c447] master: Cleanup: Reduce variable scope

Julian Eisel noreply at git.blender.org
Wed Mar 17 13:01:35 CET 2021


Commit: 9cf25b9c447e3cd13f72894887cf08a574e5a2d6
Author: Julian Eisel
Date:   Wed Mar 17 13:01:10 2021 +0100
Branches: master
https://developer.blender.org/rB9cf25b9c447e3cd13f72894887cf08a574e5a2d6

Cleanup: Reduce variable scope

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

M	source/blender/editors/space_outliner/outliner_tools.c

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

diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c
index 5e9af78d17b..052ef9a5dea 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -1820,11 +1820,6 @@ static bool outliner_id_operation_item_poll(bContext *C,
     return false;
   }
 
-  Object *ob = NULL;
-  if (GS(tselem->id->name) == ID_OB) {
-    ob = (Object *)tselem->id;
-  }
-
   switch (enum_value) {
     case OUTLINER_IDOP_MARK_ASSET:
     case OUTLINER_IDOP_CLEAR_ASSET:
@@ -1839,11 +1834,16 @@ static bool outliner_id_operation_item_poll(bContext *C,
         return true;
       }
       return false;
-    case OUTLINER_IDOP_OVERRIDE_LIBRARY_PROXY_CONVERT:
-      if (ob != NULL && ob->proxy != NULL) {
-        return true;
+    case OUTLINER_IDOP_OVERRIDE_LIBRARY_PROXY_CONVERT: {
+      if (GS(tselem->id->name) == ID_OB) {
+        Object *ob = (Object *)tselem->id;
+
+        if ((ob != NULL) && (ob->proxy != NULL)) {
+          return true;
+        }
       }
       return false;
+    }
     case OUTLINER_IDOP_OVERRIDE_LIBRARY_RESET:
     case OUTLINER_IDOP_OVERRIDE_LIBRARY_RESET_HIERARCHY:
     case OUTLINER_IDOP_OVERRIDE_LIBRARY_RESYNC_HIERARCHY:



More information about the Bf-blender-cvs mailing list