[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49920] branches/soc-2011-tomato: svn merge ^/trunk/blender -r49917:49919

Campbell Barton ideasman42 at gmail.com
Wed Aug 15 13:32:56 CEST 2012


Revision: 49920
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49920
Author:   campbellbarton
Date:     2012-08-15 11:32:56 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r49917:49919

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49917

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.h

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49917
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49919


Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49917
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49919

Modified: branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c	2012-08-15 11:31:04 UTC (rev 49919)
+++ branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c	2012-08-15 11:32:56 UTC (rev 49920)
@@ -40,6 +40,7 @@
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 
+#include "BKE_blender.h"
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_global.h"
@@ -72,6 +73,8 @@
 
 #include "node_intern.h"  /* own include */
 
+#define USE_ESC_COMPO
+
 /* ***************** composite job manager ********************** */
 
 typedef struct CompoJob {
@@ -88,7 +91,13 @@
 {
 	CompoJob *cj = cjv;
 	
-	return *(cj->stop);
+	/* without G.is_break 'ESC' wont quit - which annoys users */
+	return (*(cj->stop)
+#ifdef USE_ESC_COMPO
+	        ||
+	        G.is_break
+#endif
+	        );
 }
 
 /* called by compo, wmJob sends notifier */
@@ -181,6 +190,10 @@
 		return;
 	}
 
+#ifdef USE_ESC_COMPO
+	G.is_break = FALSE;
+#endif
+
 	wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene_owner, "Compositing",
 	                     WM_JOB_EXCL_RENDER | WM_JOB_PROGRESS, WM_JOB_TYPE_COMPOSITE);
 	cj = MEM_callocN(sizeof(CompoJob), "compo job");


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49917
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49919

Modified: branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.h
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.h	2012-08-15 11:31:04 UTC (rev 49919)
+++ branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.h	2012-08-15 11:32:56 UTC (rev 49920)
@@ -285,25 +285,29 @@
 
 /* for event checks */
 	/* only used for KM_TEXTINPUT, so assume that we want all user-inputtable ascii codes included */
-#define ISTEXTINPUT(event)	(event >=' ' && event <=255)
+#define ISTEXTINPUT(event)  (event >= ' ' && event <= 255)
 
 	/* test whether the event is a key on the keyboard */
-#define ISKEYBOARD(event)	(event >=' ' && event <=320)
+#define ISKEYBOARD(event)  (event >= ' ' && event <= 320)
 
 	/* test whether the event is a modifier key */
-#define ISKEYMODIFIER(event)	((event >= LEFTCTRLKEY && event <= LEFTSHIFTKEY) || event == OSKEY)
+#define ISKEYMODIFIER(event)  ((event >= LEFTCTRLKEY && event <= LEFTSHIFTKEY) || event == OSKEY)
 
 	/* test whether the event is a mouse button */
-#define ISMOUSE(event)	(event >= LEFTMOUSE && event <= MOUSEROTATE)
+#define ISMOUSE(event)  (event >= LEFTMOUSE && event <= MOUSEROTATE)
 
 	/* test whether the event is tweak event */
-#define ISTWEAK(event)	(event >= EVT_TWEAK_L && event <= EVT_GESTURE)
+#define ISTWEAK(event)  (event >= EVT_TWEAK_L && event <= EVT_GESTURE)
 
 	/* test whether the event is a NDOF event */
-#define ISNDOF(event)	(event >= NDOF_MOTION && event < NDOF_LAST)
+#define ISNDOF(event)  (event >= NDOF_MOTION && event < NDOF_LAST)
 
 /* test whether event type is acceptable as hotkey, excluding modifiers */
-#define ISHOTKEY(event)	((ISKEYBOARD(event) || ISMOUSE(event) || ISNDOF(event)) && event!=ESCKEY && !(event>=LEFTCTRLKEY && event<=LEFTSHIFTKEY) && !(event>=UNKNOWNKEY && event<=GRLESSKEY))
+#define ISHOTKEY(event)                                           \
+	((ISKEYBOARD(event) || ISMOUSE(event) || ISNDOF(event)) &&    \
+	 (event != ESCKEY) &&                                         \
+	 (event >= LEFTCTRLKEY && event <= LEFTSHIFTKEY) == FALSE &&  \
+	 (event >= UNKNOWNKEY  && event <= GRLESSKEY) == FALSE)
 
 /* **************** BLENDER GESTURE EVENTS (0x5000) **************** */
 




More information about the Bf-blender-cvs mailing list