diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2015-04-17 15:48:31 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2015-04-17 15:48:31 +0300 |
commit | 479b6696932d133078690063508d8447d6dc0a28 (patch) | |
tree | bb4880a909f46e303d05a5305eea401bd38fbe94 /source/blender/render | |
parent | 02fba106fad37647ab015c228248ac0ec13a964b (diff) |
Fix T44336: Unable to select cycles-specific passes in UV/image editor
This approach gets rid of iuser->pass for good.
Also, I'm commenting out the pass increase/decrease. This was broken
since multiview. I will fix it later (before 2.75), but I didn't want to
get this patch mangled with that fix.
Thanks Sergey Sharybin for the review and feedbacks.
Reviewers: sergey
Differential Revision: https://developer.blender.org/D1232
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 482677c7585..20678b29d0e 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -315,6 +315,8 @@ int RE_seq_render_active(struct Scene *scene, struct RenderData *rd); bool RE_layers_have_name(struct RenderResult *result); +struct RenderPass *RE_pass_find_by_type(struct RenderLayer *rl, int passtype, const char *viewname); + /* shaded view or baking options */ #define RE_BAKE_LIGHT 0 /* not listed in rna_scene.c -> can't be enabled! */ #define RE_BAKE_ALL 1 diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 24e66cbf3cb..e9b0a2bcbf4 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3856,4 +3856,14 @@ bool RE_layers_have_name(struct RenderResult *rr) return false; } - +RenderPass *RE_pass_find_by_type(RenderLayer *rl, int passtype, const char *viewname) +{ + RenderPass *rp; + for (rp = rl->passes.first; rp; rp = rp->next) { + if (rp->passtype == passtype) { + if (STREQ(rp->view, viewname)) + return rp; + } + } + return NULL; +} |