[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26236] trunk/blender/source/blender/ editors/interface/interface_handlers.c: Fix [#20786] Added widget on toolbar does not remove
Matt Ebb
matt at mke3.net
Mon Jan 25 07:48:05 CET 2010
Revision: 26236
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26236
Author: broken
Date: 2010-01-25 07:48:04 +0100 (Mon, 25 Jan 2010)
Log Message:
-----------
Fix [#20786] Added widget on toolbar does not remove
Fix [#20794] Can't save my file by pressing "Enter" button
- removed the ability to activate a text field by pressing enter when the mouse is over it. This wasn't that practical and now allows the convenient 2.4 behaviour in the file selector filename field, of pressing enter twice to save.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2010-01-25 06:24:05 UTC (rev 26235)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2010-01-25 06:48:04 UTC (rev 26236)
@@ -1949,7 +1949,7 @@
static int ui_do_but_TEX(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data, wmEvent *event)
{
if(data->state == BUTTON_STATE_HIGHLIGHT) {
- if(ELEM4(event->type, LEFTMOUSE, PADENTER, RETKEY, EVT_BUT_OPEN) && event->val==KM_PRESS) {
+ if(ELEM(event->type, LEFTMOUSE, EVT_BUT_OPEN) && event->val==KM_PRESS) {
if(but->dt == UI_EMBOSSN && !event->ctrl);
else {
button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
@@ -3491,7 +3491,8 @@
km = WM_keymap_guess_opname(C, but->optype->idname);
kmi = WM_keymap_add_item(km, but->optype->idname, AKEY, KM_PRESS, 0, 0);
MEM_freeN(kmi->properties);
- kmi->properties= IDP_CopyProperty(prop);
+ if (prop)
+ kmi->properties= IDP_CopyProperty(prop);
RNA_pointer_create(NULL, &RNA_KeyMapItem, kmi, &ptr);
More information about the Bf-blender-cvs
mailing list