forked from bartvdbraak/blender
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.
This commit is contained in:
parent
12a1fc374e
commit
bfd9f8e196
@ -152,6 +152,10 @@ static void do_node_selectmenu(void *arg, int event)
|
|||||||
{
|
{
|
||||||
SpaceNode *snode= curarea->spacedata.first;
|
SpaceNode *snode= curarea->spacedata.first;
|
||||||
|
|
||||||
|
/* functions in editnode.c assume there's a tree */
|
||||||
|
if(snode->nodetree==NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
switch(event) {
|
switch(event) {
|
||||||
case 1: /* border select */
|
case 1: /* border select */
|
||||||
node_border_select(snode);
|
node_border_select(snode);
|
||||||
@ -415,7 +419,9 @@ static void do_node_nodemenu(void *arg, int event)
|
|||||||
SpaceNode *snode= curarea->spacedata.first;
|
SpaceNode *snode= curarea->spacedata.first;
|
||||||
int fromlib=0;
|
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);
|
fromlib= (snode->id && snode->id->lib);
|
||||||
|
|
||||||
switch(event) {
|
switch(event) {
|
||||||
|
@ -3423,7 +3423,7 @@ static void winqreadbutspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
|
|||||||
sa= curarea;
|
sa= curarea;
|
||||||
areawinset(sa3d->win);
|
areawinset(sa3d->win);
|
||||||
|
|
||||||
if(event==PKEY) start_game();
|
if(event==PKEY && G.qual==0) start_game();
|
||||||
else if(event==ZKEY) toggle_shading();
|
else if(event==ZKEY) toggle_shading();
|
||||||
else persptoetsen(event);
|
else persptoetsen(event);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user