[Bf-blender-cvs] [a287153ee49] master: Cleanup: use more explicit check for buttons context

Campbell Barton noreply at git.blender.org
Fri May 10 05:50:41 CEST 2019


Commit: a287153ee49741e23dbee273a6ad7425dab94de4
Author: Campbell Barton
Date:   Fri May 10 12:51:04 2019 +1000
Branches: master
https://developer.blender.org/rBa287153ee49741e23dbee273a6ad7425dab94de4

Cleanup: use more explicit check for buttons context

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

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 577f7a7af8a..fde8b8f85f8 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -785,8 +785,11 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
   SpaceProperties *sbuts = CTX_wm_space_properties(C);
   ButsContextPath *path = sbuts ? sbuts->path : NULL;
 
-  /* A zero sized path will be set for 'BCONTEXT_TOOL'. */
-  if (!path || !path->len) {
+  if (sbuts->mainb == BCONTEXT_TOOL) {
+    return 0;
+  }
+
+  if (!path) {
     return 0;
   }



More information about the Bf-blender-cvs mailing list