diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-07-21 15:52:41 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-07-21 15:52:41 +0400 |
| commit | bfd9f8e196b2ce4a50de1a6d29b67841410866e6 (patch) | |
| tree | a3e60be9c1e214fa44cd4130ef97cb5092c04abb /source/blender/src/header_node.c | |
| parent | 12a1fc374e7b47cca9b2e10c0804cb5f2d563194 (diff) | |
Bugfix #4747
Using "Deselect all" pulldown in Node Editor crashed when no nodetree is
visible.
Bugfix #4753
Hotkey SHIFT+P in buttons window started game engine, which it should not.
Diffstat (limited to 'source/blender/src/header_node.c')
| -rw-r--r-- | source/blender/src/header_node.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/src/header_node.c b/source/blender/src/header_node.c index 11cfef36761..91e421736f2 100644 --- a/source/blender/src/header_node.c +++ b/source/blender/src/header_node.c @@ -152,6 +152,10 @@ static void do_node_selectmenu(void *arg, int event) { SpaceNode *snode= curarea->spacedata.first; + /* functions in editnode.c assume there's a tree */ + if(snode->nodetree==NULL) + return; + switch(event) { case 1: /* border select */ node_border_select(snode); @@ -415,7 +419,9 @@ static void do_node_nodemenu(void *arg, int event) SpaceNode *snode= curarea->spacedata.first; int fromlib=0; - if(snode->nodetree==NULL) return; + /* functions in editnode.c assume there's a tree */ + if(snode->nodetree==NULL) + return; fromlib= (snode->id && snode->id->lib); switch(event) { |