[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24569] trunk/blender/source/blender/ editors/space_node/node_edit.c: Bugfix #19887: Blender crash when resizing nodes in node editor
Joshua Leung
aligorith at gmail.com
Sun Nov 15 12:32:29 CET 2009
Revision: 24569
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24569
Author: aligorith
Date: 2009-11-15 12:32:29 +0100 (Sun, 15 Nov 2009)
Log Message:
-----------
Bugfix #19887: Blender crash when resizing nodes in node editor
This commit fixes the crash, but there are currently some issues with getting the active node in general with the Nodes Editor.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/node_edit.c
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2009-11-15 11:20:44 UTC (rev 24568)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2009-11-15 11:32:29 UTC (rev 24569)
@@ -1169,14 +1169,16 @@
UI_view2d_region_to_view(&ar->v2d, event->x - ar->winrct.xmin, event->y - ar->winrct.ymin,
&mx, &my);
- if(node->flag & NODE_HIDDEN) {
- node->miniwidth= nsw->oldwidth + mx - nsw->mxstart;
- CLAMP(node->miniwidth, 0.0f, 100.0f);
+ if (node) {
+ if(node->flag & NODE_HIDDEN) {
+ node->miniwidth= nsw->oldwidth + mx - nsw->mxstart;
+ CLAMP(node->miniwidth, 0.0f, 100.0f);
+ }
+ else {
+ node->width= nsw->oldwidth + mx - nsw->mxstart;
+ CLAMP(node->width, node->typeinfo->minwidth, node->typeinfo->maxwidth);
+ }
}
- else {
- node->width= nsw->oldwidth + mx - nsw->mxstart;
- CLAMP(node->width, node->typeinfo->minwidth, node->typeinfo->maxwidth);
- }
ED_region_tag_redraw(ar);
More information about the Bf-blender-cvs
mailing list