[Bf-blender-cvs] [b61ecb785c9] master: Cleanup: Explicit return in each `else if` block in `buttons_context()`

Sybren A. Stüvel noreply at git.blender.org
Fri Jul 3 17:43:26 CEST 2020


Commit: b61ecb785c96a7959ddc91c0efe68d1eb9358c6d
Author: Sybren A. Stüvel
Date:   Fri Jul 3 16:34:57 2020 +0200
Branches: master
https://developer.blender.org/rBb61ecb785c96a7959ddc91c0efe68d1eb9358c6d

Cleanup: Explicit return in each `else if` block in `buttons_context()`

This is a similar change as in rB4283da83cc9.

No functional changes.

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

M	source/blender/editors/space_buttons/buttons_context.c

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

diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index ba618083620..f4141fd31f8 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -956,6 +956,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
 
       return 1;
     }
+    return -1; /* found but not available */
   }
   else if (CTX_data_equals(member, "texture_slot")) {
     ButsContextTexture *ct = sbuts->texuser;
@@ -1039,6 +1040,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
       CTX_data_pointer_set(result, &ob->id, &RNA_ClothModifier, md);
       return 1;
     }
+    return -1; /* found but not available */
   }
   else if (CTX_data_equals(member, "soft_body")) {
     PointerRNA *ptr = get_pointer_type(path, &RNA_Object);
@@ -1049,6 +1051,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
       CTX_data_pointer_set(result, &ob->id, &RNA_SoftBodyModifier, md);
       return 1;
     }
+    return -1; /* found but not available */
   }
 
   else if (CTX_data_equals(member, "fluid")) {
@@ -1060,6 +1063,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
       CTX_data_pointer_set(result, &ob->id, &RNA_FluidModifier, md);
       return 1;
     }
+    return -1; /* found but not available */
   }
   else if (CTX_data_equals(member, "collision")) {
     PointerRNA *ptr = get_pointer_type(path, &RNA_Object);
@@ -1070,6 +1074,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
       CTX_data_pointer_set(result, &ob->id, &RNA_CollisionModifier, md);
       return 1;
     }
+    return -1; /* found but not available */
   }
   else if (CTX_data_equals(member, "brush")) {
     set_pointer_type(path, result, &RNA_Brush);
@@ -1084,6 +1089,7 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
       CTX_data_pointer_set(result, &ob->id, &RNA_DynamicPaintModifier, md);
       return 1;
     }
+    return -1; /* found but not available */
   }
   else if (CTX_data_equals(member, "line_style")) {
     set_pointer_type(path, result, &RNA_FreestyleLineStyle);



More information about the Bf-blender-cvs mailing list