[Bf-blender-cvs] [8948d53] master: Fix T37345: Image baking progress bar wrongly appears in node editor

[Sergey Sharybin]

Commit: 8948d53d986a72ade101bc5d163dc20b5fa67af7
Author: Sergey Sharybin
Date:   Mon Nov 18 14:02:58 2013 +0600
http://developer.blender.org/rB8948d53d986a72ade101bc5d163dc20b5fa67af7

Fix T37345: Image baking progress bar wrongly appears in node editor

Baking job is owned by scene but only need to update image space
contexts. This leads to job progress bar stuck in node editor.

Made it so node editor does not display baking jobs now.

===================================================================

M	source/blender/editors/interface/interface_templates.c

===================================================================

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 46cff2f..ef9b16f 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3239,6 +3239,16 @@ void uiTemplateRunningJobs(uiLayout *layout, bContext *C)
 				handle_event = B_STOPCOMPO;
 				break;
 			}
+			else if (WM_jobs_test(wm, scene, WM_JOB_TYPE_OBJECT_BAKE_TEXTURE)) {
+				/* Skip bake jobs in compositor to avoid compo header displaying
+				 * progress bar which is not being updated (bake jobs only need
+				 * to update NC_IMAGE context.
+				 */
+				if (sa->spacetype != SPACE_NODE) {
+					handle_event = B_STOPOTHER;
+					break;
+				}
+			}
 			else if (WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY)) {
 				handle_event = B_STOPOTHER;
 				break;