[Bf-blender-cvs] [6ac300a] master: Fix part of T39692: Text fields in datablocks editor are broken
Bastien Montagne
noreply at git.blender.org
Sun Apr 27 21:45:28 CEST 2014
Commit: 6ac300ae7259c9cb52dfa8de0a13d87af5ee0bbd
Author: Bastien Montagne
Date: Sun Apr 27 21:40:24 2014 +0200
https://developer.blender.org/rB6ac300ae7259c9cb52dfa8de0a13d87af5ee0bbd
Fix part of T39692: Text fields in datablocks editor are broken
Text field part. Issue with enums dropdowns remains a mystery currently.
As for pointer fields, afaict they have never worked here, though it should
not crash.
UI_EMBOSS are values, not bitflags (own fault, most likely)...
Note we should probably get rid of UI_EMBOSST, it is used nowhere in UI code (set
in one place only, used nowhere).
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 10951c6..a1f1d35 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -6340,7 +6340,7 @@ static bool ui_is_but_interactive(const uiBut *but, const bool labeledit)
return false;
if (but->flag & UI_SCROLLED)
return false;
- if ((but->type == TEX) && (but->dt & UI_EMBOSSN) && !labeledit)
+ if ((but->type == TEX) && (but->dt == UI_EMBOSSN) && !labeledit)
return false;
if ((but->type == LISTROW) && labeledit)
return false;
More information about the Bf-blender-cvs
mailing list