diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2019-05-16 18:03:16 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-16 18:40:13 +0300 |
commit | 9f6670ca375552c1382ac340ad184e2e1882c2aa (patch) | |
tree | f303417f32a784129398ffe6a8ab621a358165e1 /release/scripts/startup | |
parent | 2ee762344f8742618804e869536e3efee6ab0bd0 (diff) |
Cycles/Eeeve: unify film transparent setting
For existing files, it will use the setting from Cycles or Eevee depending on
the render engine in the scene.
Differential Revision: https://developer.blender.org/D4874
Diffstat (limited to 'release/scripts/startup')
-rw-r--r-- | release/scripts/startup/bl_operators/clip.py | 3 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 664684cce6d..e857d8547a7 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -850,9 +850,6 @@ class CLIP_OT_setup_tracking_scene(Operator): # Ensure no nodes were created on the position of existing node. self._offsetNodes(tree) - if hasattr(scene, "cycles"): - scene.cycles.film_transparent = True - @staticmethod def _createMesh(collection, name, vertices, faces): from bpy_extras.io_utils import unpack_list diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 56784cdcdaa..18ef034af32 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -495,7 +495,7 @@ class RENDER_PT_eevee_film(RenderButtonsPanel, Panel): col = layout.column() col.prop(rd, "filter_size") - col.prop(rd, "alpha_mode", text="Alpha") + col.prop(rd, "film_transparent", text="Transparent") class RENDER_PT_eevee_film_overscan(RenderButtonsPanel, Panel): @@ -573,7 +573,7 @@ class RENDER_PT_opengl_film(RenderButtonsPanel, Panel): layout.use_property_decorate = False # No animation. rd = context.scene.render - layout.prop(rd, "alpha_mode") + layout.prop(rd, "film_transparent", text="Transparent") class RENDER_PT_opengl_lighting(RenderButtonsPanel, Panel): |