Commit: 2cc913d7d9142ad126c5c3c35e93c92cc11d8214
Author: Hans Goudey
Date: Wed Sep 30 12:31:53 2020 -0500
Branches: master
https://developer.blender.org/rB2cc913d7d9142ad126c5c3c35e93c92cc11d8214
Fix implicit conversion from pointer to bool
Error in 9b6c5268bc20. Also move variable declaration to where it's
used to reduce confusion.
===================================================================
M source/blender/editors/interface/interface.c
===================================================================
diff --git a/source/blender/editors/interface/interface.c
b/source/blender/editors/interface/interface.c
index 68e02ba1e55..25354c30c62 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1322,14 +1322,11 @@ static bool ui_but_event_property_operator_string(const
bContext *C,
opnames_len = ARRAY_SIZE(ctx_enum_opnames);
}
}
-
- bool found = false;
-
/* Don't use the button again. */
but = NULL;
if (prop == NULL) {
- return NULL;
+ return false;
}
/* this version is only for finding hotkeys for properties
@@ -1414,6 +1411,7 @@ static bool ui_but_event_property_operator_string(const
bContext *C,
}
/* we have a datapath! */
+ bool found = false;
if (data_path || (prop_enum_value_ok && prop_enum_value_id)) {
/* create a property to host the "datapath" property we're sending to the
operators */
IDProperty *prop_path;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
