Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-11-18 12:02:58 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-11-18 12:04:10 +0400
commit8948d53d986a72ade101bc5d163dc20b5fa67af7 (patch)
treec3709c612d13e93310ce3d8aede1f143b494e771
parentc18712e86814d176433cea781fe1e68715c23bd4 (diff)
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.
-rw-r--r--source/blender/editors/interface/interface_templates.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 46cff2fb458..ef9b16f5445 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;