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:
authorDalai Felinto <dfelinto@gmail.com>2017-11-22 15:52:39 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-11-23 12:48:23 +0300
commit3abe8b3292cf7a50a9200b95401993384df24d9a (patch)
tree6c7a853710f1a4264dd1bb4d7b9bf14f44b75f33 /release/scripts/startup/bl_operators/clip.py
parentfb7d23bdb2a5c0ed00067045e4acdf6593258b52 (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 'release/scripts/startup/bl_operators/clip.py')
-rw-r--r--release/scripts/startup/bl_operators/clip.py22
1 files changed, 11 insertions, 11 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index f39dc1a8b08..467512a9746 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -611,24 +611,24 @@ class CLIP_OT_setup_tracking_scene(Operator):
CLIP_set_viewport_background(context, True, sc.clip, sc.clip_user)
@staticmethod
- def _setupRenderLayers(context):
+ def _setupViewLayers(context):
scene = context.scene
- rlayers = scene.render_layers
+ view_layers = scene.view_layers
- if not scene.render_layers.get("Foreground"):
- if len(rlayers) == 1:
- fg = rlayers[0]
+ if not view_layers.get("Foreground"):
+ if len(view_layers) == 1:
+ fg = view_layers[0]
fg.name = 'Foreground'
else:
- fg = scene.render_layers.new("Foreground")
+ fg = view_layers.new("Foreground")
fg.use_sky = True
fg.layers = [True] + [False] * 19
fg.layers_zmask = [False] * 10 + [True] + [False] * 9
fg.use_pass_vector = True
- if not scene.render_layers.get("Background"):
- bg = scene.render_layers.new("Background")
+ if not view_layers.get("Background"):
+ bg = view_layers.new("Background")
bg.use_pass_shadow = True
bg.use_pass_ambient_occlusion = True
bg.layers = [False] * 10 + [True] + [False] * 9
@@ -940,8 +940,8 @@ class CLIP_OT_setup_tracking_scene(Operator):
def _setupObjects(self, context):
scene = context.scene
- fg = scene.render_layers.get("Foreground")
- bg = scene.render_layers.get("Background")
+ fg = scene.view_layers.get("Foreground")
+ bg = scene.view_layers.get("Background")
all_layers = self._mergeLayers(fg.layers, bg.layers)
@@ -985,7 +985,7 @@ class CLIP_OT_setup_tracking_scene(Operator):
self._setupWorld(context)
self._setupCamera(context)
self._setupViewport(context)
- self._setupRenderLayers(context)
+ self._setupViewLayers(context)
self._setupNodes(context)
self._setupObjects(context)