diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-10-11 15:07:25 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-10-11 15:07:25 +0400 |
commit | d35178ee61b4bd434a3a1cd05c06b4f56c2dbf69 (patch) | |
tree | 146558ec73f9b35a21e1490f047b635d2a4c6794 | |
parent | ac5c48d1860c8b4c028154e04114c35727711df3 (diff) |
Grease Pencil Bugfixes:
* Fix for #17808: Can't compile using SunCC - gpencil.c uses DOS line endings.
Added some svn-properties on gpencil files and also keyframing ones that I added, so that this shouldn't be a problem anymore.
* In Node Editor, it is now possible to close an open Grease Pencil panel when there is no node-tree being shown (i.e. after switching between node editing modes)
-rw-r--r-- | source/blender/include/BDR_gpencil.h | 2 | ||||
-rw-r--r-- | source/blender/include/BIF_drawgpencil.h | 2 | ||||
-rw-r--r-- | source/blender/include/BIF_keyframing.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 2 | ||||
-rw-r--r-- | source/blender/src/drawgpencil.c | 2 | ||||
-rw-r--r-- | source/blender/src/editaction_gpencil.c | 2 | ||||
-rw-r--r-- | source/blender/src/editnode.c | 7 | ||||
-rw-r--r-- | source/blender/src/gpencil.c | 2 | ||||
-rw-r--r-- | source/blender/src/keyframing.c | 2 |
9 files changed, 14 insertions, 9 deletions
diff --git a/source/blender/include/BDR_gpencil.h b/source/blender/include/BDR_gpencil.h index 82263c8cda7..6af156775be 100644 --- a/source/blender/include/BDR_gpencil.h +++ b/source/blender/include/BDR_gpencil.h @@ -1,5 +1,5 @@ /** - * $Id: BDR_gpencil.h 14444 2008-04-16 22:40:48Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/include/BIF_drawgpencil.h b/source/blender/include/BIF_drawgpencil.h index eacafce058d..ae2ec192cc7 100644 --- a/source/blender/include/BIF_drawgpencil.h +++ b/source/blender/include/BIF_drawgpencil.h @@ -1,5 +1,5 @@ /** - * $Id: BIF_drawgpencil.h 14444 2008-04-16 22:40:48Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/include/BIF_keyframing.h b/source/blender/include/BIF_keyframing.h index 9f85e69b77f..dbbe55123e4 100644 --- a/source/blender/include/BIF_keyframing.h +++ b/source/blender/include/BIF_keyframing.h @@ -1,5 +1,5 @@ /** - * $Id: BIF_keyframing.h 14444 2008-04-16 22:40:48Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index cc0c9912057..70f469b2bb8 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -1,5 +1,5 @@ /** - * $Id: DNA_gpencil_types.h 8768 2006-11-07 00:10:37Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/src/drawgpencil.c b/source/blender/src/drawgpencil.c index 769fabae1db..99fd66ab3d8 100644 --- a/source/blender/src/drawgpencil.c +++ b/source/blender/src/drawgpencil.c @@ -1,5 +1,5 @@ /** - * $Id: drawgpencil.c 14881 2008-05-18 10:41:42Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/src/editaction_gpencil.c b/source/blender/src/editaction_gpencil.c index 1f30b83c6b3..5ea12faffd4 100644 --- a/source/blender/src/editaction_gpencil.c +++ b/source/blender/src/editaction_gpencil.c @@ -1,5 +1,5 @@ /** - * $Id: editaction_gpencil.c 14881 2008-05-18 10:41:42Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/src/editnode.c b/source/blender/src/editnode.c index d3ba153e600..23387673f95 100644 --- a/source/blender/src/editnode.c +++ b/source/blender/src/editnode.c @@ -2395,7 +2395,12 @@ void winqreadnodespace(ScrArea *sa, void *spacedata, BWinEvent *evt) short val= evt->val, doredraw=0, fromlib= 0; if(sa->win==0) return; - if(snode->nodetree==NULL) return; + + if(snode->nodetree==NULL) { + /* no other events should be handled, but floating panels still should get handled */ + uiDoBlocks(&curarea->uiblocks, event, 1); + return; + } if(val) { if( node_uiDoBlocks(sa, event)!=UI_NOTHING ) event= 0; diff --git a/source/blender/src/gpencil.c b/source/blender/src/gpencil.c index fe91b94eefc..cae1c773488 100644 --- a/source/blender/src/gpencil.c +++ b/source/blender/src/gpencil.c @@ -1,5 +1,5 @@ /** - * $Id: gpencil.c 14881 2008-05-18 10:41:42Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * diff --git a/source/blender/src/keyframing.c b/source/blender/src/keyframing.c index f0b3b98504c..c5777b9c2a6 100644 --- a/source/blender/src/keyframing.c +++ b/source/blender/src/keyframing.c @@ -1,5 +1,5 @@ /** - * $Id: keyframing.c 14881 2008-05-18 10:41:42Z aligorith $ + * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** * |