diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-22 15:52:39 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 12:48:23 +0300 |
| commit | 3abe8b3292cf7a50a9200b95401993384df24d9a (patch) | |
| tree | 6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /source/blender/compositor | |
| parent | fb7d23bdb2a5c0ed00067045e4acdf6593258b52 (diff) | |
Rename any instance of scene layer or render layer in code with view layer
The RenderResult struct still has a listbase of RenderLayer, but that's ok
since this is strictly for rendering.
* Subversion bump (to 2.80.2)
* DNA low level doversion (renames) - only for .blend created since 2.80 started
Note: We can't use DNA_struct_elem_find or get file version in init_structDNA,
so we are manually iterating over the array of the SDNA elements instead.
Note 2: This doversion change with renames can be reverted in a few months. But
so far it's required for 2.8 files created between October 2016 and now.
Reviewers: campbellbarton, sergey
Differential Revision: https://developer.blender.org/D2927
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/nodes/COM_RenderLayersNode.cpp | 6 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_RenderLayersProg.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp index d1bb8462aa1..e16aca3fdee 100644 --- a/source/blender/compositor/nodes/COM_RenderLayersNode.cpp +++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cpp @@ -65,12 +65,12 @@ void RenderLayersNode::testRenderLink(NodeConverter &converter, missingRenderLink(converter); return; } - SceneLayer *scene_layer = (SceneLayer *)BLI_findlink(&scene->render_layers, layerId); - if (scene_layer == NULL) { + ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, layerId); + if (view_layer == NULL) { missingRenderLink(converter); return; } - RenderLayer *rl = RE_GetRenderLayer(rr, scene_layer->name); + RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); if (rl == NULL) { missingRenderLink(converter); return; diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index eec05f582f0..a5e2d275e4f 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -55,10 +55,10 @@ void RenderLayersProg::initExecution() rr = RE_AcquireResultRead(re); if (rr) { - SceneLayer *scene_layer = (SceneLayer *)BLI_findlink(&scene->render_layers, getLayerId()); - if (scene_layer) { + ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&scene->view_layers, getLayerId()); + if (view_layer) { - RenderLayer *rl = RE_GetRenderLayer(rr, scene_layer->name); + RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); if (rl) { this->m_inputBuffer = RE_RenderLayerGetPass(rl, this->m_passName.c_str(), this->m_viewName); } @@ -189,9 +189,9 @@ void RenderLayersProg::determineResolution(unsigned int resolution[2], unsigned rr = RE_AcquireResultRead(re); if (rr) { - SceneLayer *scene_layer = (SceneLayer *)BLI_findlink(&sce->render_layers, getLayerId()); - if (scene_layer) { - RenderLayer *rl = RE_GetRenderLayer(rr, scene_layer->name); + ViewLayer *view_layer = (ViewLayer *)BLI_findlink(&sce->view_layers, getLayerId()); + if (view_layer) { + RenderLayer *rl = RE_GetRenderLayer(rr, view_layer->name); if (rl) { resolution[0] = rl->rectx; resolution[1] = rl->recty; |