diff options
Diffstat (limited to 'release/scripts/startup/bl_ui')
4 files changed, 60 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_light.py b/release/scripts/startup/bl_ui/properties_data_light.py index 8aa70d1e05f..7d21ecb99b3 100644 --- a/release/scripts/startup/bl_ui/properties_data_light.py +++ b/release/scripts/startup/bl_ui/properties_data_light.py @@ -105,6 +105,36 @@ class DATA_PT_EEVEE_light(DataButtonsPanel, Panel): sub.prop(light, "size_y", text="Y") +class DATA_PT_EEVEE_light_distance(DataButtonsPanel, Panel): + bl_label = "Custom Distance" + bl_parent_id = "DATA_PT_EEVEE_light" + bl_options = {'DEFAULT_CLOSED'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} + + @classmethod + def poll(cls, context): + light = context.light + engine = context.engine + + return (light and light.type != 'SUN') and (engine in cls.COMPAT_ENGINES) + + def draw_header(self, context): + light = context.light + + layout = self.layout + layout.active = light.use_shadow + layout.prop(light, "use_custom_distance", text="") + + def draw(self, context): + layout = self.layout + light = context.light + layout.use_property_split = True + + col = layout.column() + + col.prop(light, "cutoff_distance", text="Distance") + + class DATA_PT_EEVEE_shadow(DataButtonsPanel, Panel): bl_label = "Shadow" bl_options = {'DEFAULT_CLOSED'} @@ -131,7 +161,8 @@ class DATA_PT_EEVEE_shadow(DataButtonsPanel, Panel): col = layout.column() sub = col.column(align=True) sub.prop(light, "shadow_buffer_clip_start", text="Clip Start") - sub.prop(light, "shadow_buffer_clip_end", text="End") + if light.type == 'SUN': + sub.prop(light, "shadow_buffer_clip_end", text="End") col.prop(light, "shadow_buffer_soft", text="Softness") @@ -281,6 +312,7 @@ classes = ( DATA_PT_preview, DATA_PT_light, DATA_PT_EEVEE_light, + DATA_PT_EEVEE_light_distance, DATA_PT_EEVEE_shadow, DATA_PT_EEVEE_shadow_contact, DATA_PT_EEVEE_shadow_cascaded_shadow_map, diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index bbb1a067dd7..18be337c204 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -390,6 +390,7 @@ class RENDER_PT_eevee_shadows(RenderButtonsPanel, Panel): col.prop(props, "shadow_cascade_size", text="Cascade Size") col.prop(props, "use_shadow_high_bitdepth") col.prop(props, "use_soft_shadows") + col.prop(props, "light_threshold") class RENDER_PT_eevee_sampling(RenderButtonsPanel, Panel): @@ -445,6 +446,10 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): col.prop(props, "gi_diffuse_bounces") col.prop(props, "gi_cubemap_resolution") col.prop(props, "gi_visibility_resolution", text="Diffuse Occlusion") + col.prop(props, "gi_irradiance_smoothing") + col.prop(props, "gi_glossy_clamp") + col.prop(props, "gi_filter_quality") + class RENDER_PT_eevee_indirect_lighting_display(RenderButtonsPanel, Panel): bl_label = "Display" diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 08125156705..e681b794f66 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -76,7 +76,6 @@ class _defs_view3d_generic: "Set the cursor location, drag to transform" ), icon="ops.generic.cursor", - keymap=(), draw_settings=draw_settings, ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 236470af279..0d96e11cb72 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4011,7 +4011,7 @@ class VIEW3D_PT_collections(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'HEADER' bl_label = "Collections Visibility" - bl_ui_units_x = 7 + bl_ui_units_x = 10 def _draw_collection(self, layout, view_layer, collection, index): need_separator = index @@ -4029,15 +4029,31 @@ class VIEW3D_PT_collections(Panel): need_separator = False icon = 'BLANK1' + has_objects = True if child.has_selected_objects(view_layer): icon = 'LAYER_ACTIVE' elif child.has_objects(): icon = 'LAYER_USED' + else: + has_objects = False + + has_visible_objects = has_objects and child.has_visible_objects(view_layer) row = layout.row() - row.alignment = 'LEFT' - row.active = child.has_visible_objects(view_layer) - row.operator("object.hide_collection", text=child.name, icon=icon, emboss=False).collection_index = index + sub = row.split(factor=0.98) + subrow = sub.row() + subrow.alignment = 'LEFT' + subrow.active = has_visible_objects + subrow.operator("object.hide_collection", text=child.name, icon=icon, emboss=False).collection_index = index + + sub = row.split() + subrow = sub.row(align=True) + subrow.alignment = 'RIGHT' + icon = 'HIDE_OFF' if has_visible_objects else 'HIDE_ON' + props = subrow.operator("object.hide_collection", text="", icon=icon, emboss=False) + props.collection_index = index + props.toggle = True + subrow.prop(child.collection, "hide_select", text="", emboss=False) for child in collection.children: index = self._draw_collection(layout, view_layer, child, index) @@ -4046,9 +4062,9 @@ class VIEW3D_PT_collections(Panel): def draw(self, context): layout = self.layout - layout.use_property_split = True + layout.use_property_split = False - layout.label(text="Collections Visibility", icon='GROUP') + layout.label(text="Collections Visibility") col = layout.column() view_layer = context.view_layer |