[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17694] branches/blender2.5/blender/source /blender/editors/interface/interface_ops.c: 2.5

Ton Roosendaal ton at blender.org
Wed Dec 3 16:49:41 CET 2008


Revision: 17694
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17694
Author:   ton
Date:     2008-12-03 16:49:41 +0100 (Wed, 03 Dec 2008)

Log Message:
-----------
2.5

Fix crashing in pop-up menus when click.
There's something wrong still in handling menu itself, need Brecht
too look at that... probably a wrong return value somewhere.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c	2008-12-03 15:05:06 UTC (rev 17693)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_ops.c	2008-12-03 15:49:41 UTC (rev 17694)
@@ -2941,10 +2941,11 @@
 				}
 
 				break;
+			default:
+				handled= ui_do_button(C, block, but, event);
 			}
 		}
 
-		handled= ui_do_button(C, block, but, event);
 	}
 	else if(data->state == BUTTON_STATE_WAIT_RELEASE) {
 		switch(event->type) {
@@ -3248,6 +3249,10 @@
 	ar= bhandle->region;
 	block= ar->uiblocks.first;
 
+	/* XXX (for brecht) this happens when click on menu */
+	if(block==NULL)
+		return OPERATOR_FINISHED;
+	
 	act= 0;
 	handled= 0;
 





More information about the Bf-blender-cvs mailing list