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>2015-07-25 00:05:11 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-25 00:05:11 +0300
commit5acce60d376292bc228211075c9fe05b41c84ccd (patch)
tree96312421a81e20448f22fb5e3640cdaf50a8ec7a /source/blender/compositor/operations/COM_RenderLayersProg.h
parent7c5c7b5ef6c3a77411b9e197152d5754943a034d (diff)
Compositor: Fixes for the debug pass
This commit fixes issues with wrong socket type being added to the Cycles debug pass compositor operation, which lead to crashes with non-value pass types. This commit also reverts socket renaming thing because while it's was behaving ok on runtime file reload might have loose the links which is annoying.
Diffstat (limited to 'source/blender/compositor/operations/COM_RenderLayersProg.h')
-rw-r--r--source/blender/compositor/operations/COM_RenderLayersProg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h
index edefd9aeb18..89eb2a6954d 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.h
@@ -215,8 +215,8 @@ public:
#ifdef WITH_CYCLES_DEBUG
class RenderLayersCyclesDebugOperation : public RenderLayersBaseProg {
public:
- RenderLayersCyclesDebugOperation(int pass);
- void setScene(Scene *scene);
+ RenderLayersCyclesDebugOperation(int pass,
+ int debug_pass_type);
};
#endif