Revision: 20302
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20302
Author: ton
Date: 2009-05-20 18:55:28 +0200 (Wed, 20 May 2009)
Log Message:
-----------
2.5
Node editor:
- Crash could occur on ALT+LMB remove link lines (read free'd mem)
- Button labels were handled as full buttons, disabling node usage
quite a lot, like drag, select, or create links.
(Caused by making all node labels buttons)
Brecht: old UI_NO_HILITE can be depricated, it was for bad overdraw
issues. I guess it's OK to not handle Label buttons at all...
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-05-20 16:24:04 UTC (rev 20301)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-05-20 16:55:28 UTC (rev 20302)
@@ -2843,6 +2843,8 @@
for(but=block->buttons.first; but; but= but->next) {
if(but->flag & UI_NO_HILITE)
continue;
+ if(but->type==LABEL)
+ continue;
if(ui_but_contains_pt(but, mx, my))
/* give precedence to already activated buttons
*/
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2009-05-20 16:24:04 UTC (rev 20301)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
2009-05-20 16:55:28 UTC (rev 20302)
@@ -2118,7 +2118,7 @@
if(i>1) {
bNodeLink *link, *next;
- for(link= snode->edittree->links.first; link; link= link->next)
{
+ for(link= snode->edittree->links.first; link; link= next) {
next= link->next;
if(cut_links_intersect(link, mcoords, i)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
