[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32403] trunk/blender/source/blender/ editors/interface/interface_handlers.c: bugfix [#24214] F6 "last operator" panel repeatable segmentation fault

Campbell Barton ideasman42 at gmail.com
Mon Oct 11 01:37:25 CEST 2010


Revision: 32403
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32403
Author:   campbellbarton
Date:     2010-10-11 01:37:25 +0200 (Mon, 11 Oct 2010)

Log Message:
-----------
bugfix [#24214] F6 "last operator" panel repeatable segmentation fault

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-10-10 23:34:27 UTC (rev 32402)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c	2010-10-10 23:37:25 UTC (rev 32403)
@@ -5526,16 +5526,20 @@
 									((ELEM(event->type, UPARROWKEY, WHEELUPMOUSE)) && (block->direction & UI_RIGHT)) ||
 									((ELEM(event->type, DOWNARROWKEY, WHEELDOWNMOUSE)) && (block->direction & UI_TOP))
 								) {
-									if(ui_but_first(block)->type & BUT)
+									if((bt= ui_but_first(block)) && (bt->type & BUT)) {
 										bt= ui_but_last(block);
-									else
-										bt= ui_but_first(block);
+									}
+									else {
+										/* keep ui_but_first() */
+									}
 								}
 								else {
-									if(ui_but_first(block)->type & BUT)
-										bt= ui_but_first(block);
-									else
+									if((bt= ui_but_first(block)) && (bt->type & BUT)) {
+										/* keep ui_but_first() */
+									}
+									else {
 										bt= ui_but_last(block);
+									}
 								}
 
 								if(bt)





More information about the Bf-blender-cvs mailing list