sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix #4747

Browse Source 
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.
This commit is contained in:
Ton Roosendaal 2006-07-21 11:52:41 +00:00
parent 12a1fc374e
commit bfd9f8e196
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/src/header_node.c
View File

@ -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) {

2
source/blender/src/space.c
View File

@ -3423,7 +3423,7 @@ static void winqreadbutspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
sa= curarea;
areawinset(sa3d->win);
if(event==PKEY) start_game();
if(event==PKEY && G.qual==0) start_game();
else if(event==ZKEY) toggle_shading();
else persptoetsen(event);