diff options
author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-09 14:30:27 +0300 |
---|---|---|
committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-05-09 14:38:06 +0300 |
commit | c0667c2f35a1be4c56fac21d48b3a19bd460cb8d (patch) | |
tree | c5bd5dc2e9ecb5c70282a4882d7096471f480267 /release/scripts | |
parent | 56d65719b3d307d01007bd3c1ed490b5f3396adf (diff) |
T55008: Migrating RE-Collection data to Scene data
in Scene DNA is available in scene.display New DNA Struct DisplayData
Added RNA (scene.display).
We already have scene.display_settings which contains non viewpoert
specific color management settings. I did not merge those two.
Patch should be in line with the ideas that @brecht wrote in T55008.
As I am not in detail aware of the decisions that have been made for the override feature I want a short review if it is in line with the plans.
Reviewers: brecht, dfelinto
Reviewed By: brecht
Subscribers: brecht
Tags: #code_quest, #bf_blender_2.8
Differential Revision: https://developer.blender.org/D3290
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 17 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 15 |
2 files changed, 15 insertions, 17 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 610166f5845..e6d5d9bf837 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -743,22 +743,6 @@ class RENDER_PT_eevee_film(RenderButtonsPanel, Panel): col.prop(rd, "alpha_mode", text="Alpha") -class RENDER_PT_workbench_environment_light(RenderButtonsPanel, Panel): - bl_label = "Workbench Environment Light" - bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_WORKBENCH'} - - @classmethod - def poll(cls, context): - return (context.engine in cls.COMPAT_ENGINES) - - def draw(self, context): - layout = self.layout - scene = context.scene - props = scene.layer_properties['BLENDER_WORKBENCH'] - layout.prop(props, "light_direction", text="") - - classes = ( RENDER_MT_presets, RENDER_MT_ffmpeg_presets, @@ -785,7 +769,6 @@ classes = ( RENDER_PT_eevee_motion_blur, RENDER_PT_eevee_depth_of_field, RENDER_PT_eevee_bloom, - RENDER_PT_workbench_environment_light, ) if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 094f2a9dc31..cf17adfe5c1 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -429,6 +429,20 @@ class SCENE_PT_simplify(SceneButtonsPanel, Panel): col.prop(rd, "simplify_child_particles_render", text="Child Particles") +class SCENE_PT_viewport_display(SceneButtonsPanel, Panel): + bl_label = "Viewport Display" + bl_options = {'DEFAULT_CLOSED'} + + @classmethod + def poll(cls, context): + return True + + def draw(self, context): + layout = self.layout + scene = context.scene + layout.prop(scene.display, "light_direction", text="") + + class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'} _context_path = "scene" @@ -443,6 +457,7 @@ classes = ( SCENE_PT_keying_sets, SCENE_PT_keying_set_paths, SCENE_PT_color_management, + SCENE_PT_viewport_display, SCENE_PT_audio, SCENE_PT_physics, SCENE_PT_rigid_body_world, |