diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_render.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 159 |
1 files changed, 90 insertions, 69 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 404e4c4500b..92608cfccb9 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -125,6 +125,7 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True scene = context.scene rd = scene.render @@ -134,41 +135,33 @@ class RENDER_PT_dimensions(RenderButtonsPanel, Panel): row.operator("render.preset_add", text="", icon='ZOOMIN') row.operator("render.preset_add", text="", icon='ZOOMOUT').remove_active = True - split = layout.split() - - col = split.column() - sub = col.column(align=True) - sub.label(text="Resolution:") - sub.prop(rd, "resolution_x", text="X") - sub.prop(rd, "resolution_y", text="Y") - sub.prop(rd, "resolution_percentage", text="") + col = layout.column(align=True) + col.prop(rd, "resolution_x", text="Resolution X") + col.prop(rd, "resolution_y", text="Y") + col.prop(rd, "resolution_percentage") - sub.label(text="Aspect Ratio:") - sub.prop(rd, "pixel_aspect_x", text="X") - sub.prop(rd, "pixel_aspect_y", text="Y") + col = layout.column(align=True) + col.prop(rd, "pixel_aspect_x", text="Aspect X") + col.prop(rd, "pixel_aspect_y", text="Y") - row = col.row() - row.prop(rd, "use_border", text="Border") - sub = row.row() + col = layout.column(align=True) + col.prop(rd, "use_border", text="Border") + sub = col.column(align=True) sub.active = rd.use_border sub.prop(rd, "use_crop_to_border", text="Crop") - col = split.column() - sub = col.column(align=True) - sub.label(text="Frame Range:") - sub.prop(scene, "frame_start") - sub.prop(scene, "frame_end") - sub.prop(scene, "frame_step") + col = layout.column(align=True) + col.prop(scene, "frame_start", text="Frame Range Start") + col.prop(scene, "frame_end", text="End") + col.prop(scene, "frame_step", text="Step") - sub.label(text="Frame Rate:") + col = layout.split(percentage=0.5) + col.label(text="Frame Rate") + self.draw_framerate(col, rd) - self.draw_framerate(sub, rd) - - subrow = sub.row(align=True) - subrow.label(text="Time Remapping:") - subrow = sub.row(align=True) - subrow.prop(rd, "frame_map_old", text="Old") - subrow.prop(rd, "frame_map_new", text="New") + col = layout.column(align=True) + col.prop(rd, "frame_map_old", text="Time Remapping Old") + col.prop(rd, "frame_map_new", text="New") class RENDER_PT_post_processing(RenderButtonsPanel, Panel): @@ -178,16 +171,15 @@ class RENDER_PT_post_processing(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True rd = context.scene.render - split = layout.split() - - col = split.column() + col = layout.column(align=True) col.prop(rd, "use_compositing") col.prop(rd, "use_sequencer") - split.prop(rd, "dither_intensity", text="Dither", slider=True) + col.prop(rd, "dither_intensity", text="Dither", slider=True) class RENDER_PT_stamp(RenderButtonsPanel, Panel): @@ -197,24 +189,13 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = False rd = context.scene.render - layout.prop(rd, "use_stamp") - col = layout.column() - col.active = rd.use_stamp - row = col.row() - row.prop(rd, "stamp_font_size", text="Font Size") - row.prop(rd, "use_stamp_labels", text="Draw Labels") - - row = col.row() - row.column().prop(rd, "stamp_foreground", slider=True) - row.column().prop(rd, "stamp_background", slider=True) - - layout.label("Enabled Metadata") split = layout.split() - col = split.column() + col = split.column(align=True) col.prop(rd, "use_stamp_time", text="Time") col.prop(rd, "use_stamp_date", text="Date") col.prop(rd, "use_stamp_render_time", text="RenderTime") @@ -222,7 +203,7 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel): col.prop(rd, "use_stamp_scene", text="Scene") col.prop(rd, "use_stamp_memory", text="Memory") - col = split.column() + col = split.column(align=True) col.prop(rd, "use_stamp_camera", text="Camera") col.prop(rd, "use_stamp_lens", text="Lens") col.prop(rd, "use_stamp_filename", text="Filename") @@ -230,14 +211,26 @@ class RENDER_PT_stamp(RenderButtonsPanel, Panel): col.prop(rd, "use_stamp_marker", text="Marker") col.prop(rd, "use_stamp_sequencer_strip", text="Seq. Strip") - row = layout.split(percentage=0.2) + if rd.use_sequencer: + col.prop(rd, "use_stamp_strip_meta", text="Sequence Strip") + + row = layout.split(percentage=0.3) row.prop(rd, "use_stamp_note", text="Note") sub = row.row() sub.active = rd.use_stamp_note sub.prop(rd, "stamp_note_text", text="") - if rd.use_sequencer: - layout.label("Sequencer:") - layout.prop(rd, "use_stamp_strip_meta") + + layout.use_property_split = True + + layout.separator() + + layout.prop(rd, "use_stamp", text="Burn Into Image") + col = layout.column() + col.active = rd.use_stamp + col.prop(rd, "stamp_font_size", text="Font Size") + col.prop(rd, "use_stamp_labels", text="Draw Labels") + col.column().prop(rd, "stamp_foreground", slider=True) + col.column().prop(rd, "stamp_background", slider=True) class RENDER_PT_output(RenderButtonsPanel, Panel): @@ -246,6 +239,7 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = False rd = context.scene.render image_settings = rd.image_settings @@ -253,17 +247,17 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): layout.prop(rd, "filepath", text="") - split = layout.split() - - col = split.column() - col.active = not rd.is_movie_format - col.prop(rd, "use_overwrite") - col.prop(rd, "use_placeholder") + layout.use_property_split = True - col = split.column() + col = layout.column(align=True) + sub = col.column(align=True) + sub.active = not rd.is_movie_format + sub.prop(rd, "use_overwrite") + sub.prop(rd, "use_placeholder") col.prop(rd, "use_file_extension") col.prop(rd, "use_render_cache") + layout.use_property_split = False layout.template_image_settings(image_settings, color_management=False) if rd.use_multiview: layout.template_image_views(image_settings) @@ -447,6 +441,7 @@ class RENDER_PT_eevee_ambient_occlusion(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True scene = context.scene props = scene.eevee @@ -475,6 +470,7 @@ class RENDER_PT_eevee_motion_blur(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True scene = context.scene props = scene.eevee @@ -500,6 +496,7 @@ class RENDER_PT_eevee_depth_of_field(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True scene = context.scene props = scene.eevee @@ -525,6 +522,8 @@ class RENDER_PT_eevee_bloom(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene props = scene.eevee @@ -554,20 +553,32 @@ class RENDER_PT_eevee_volumetric(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene props = scene.eevee layout.active = props.use_volumetric col = layout.column() - col.prop(props, "volumetric_start") - col.prop(props, "volumetric_end") + sub = col.column(align=True) + sub.prop(props, "volumetric_start") + sub.prop(props, "volumetric_end") col.prop(props, "volumetric_tile_size") + col.separator() col.prop(props, "volumetric_samples") - col.prop(props, "volumetric_sample_distribution") + sub.prop(props, "volumetric_sample_distribution") + col.separator() col.prop(props, "use_volumetric_lights") - col.prop(props, "volumetric_light_clamp") + + sub = col.column() + sub.active = props.use_volumetric_lights + sub.prop(props, "volumetric_light_clamp", text="Light Clamping") + col.separator() col.prop(props, "use_volumetric_shadows") - col.prop(props, "volumetric_shadow_samples") + sub = col.column() + sub.active = props.use_volumetric_shadows + sub.prop(props, "volumetric_shadow_samples", text="Shadow Samples") + col.separator() col.prop(props, "use_volumetric_colored_transmittance") @@ -587,9 +598,13 @@ class RENDER_PT_eevee_subsurface_scattering(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene props = scene.eevee + layout.active = props.use_sss + col = layout.column() col.prop(props, "sss_samples") col.prop(props, "sss_jitter_threshold") @@ -612,12 +627,14 @@ class RENDER_PT_eevee_screen_space_reflections(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene props = scene.eevee col = layout.column() col.active = props.use_ssr - col.prop(props, "use_ssr_refraction") + col.prop(props, "use_ssr_refraction", text="Refraction") col.prop(props, "use_ssr_halfres") col.prop(props, "ssr_quality") col.prop(props, "ssr_max_roughness") @@ -637,6 +654,8 @@ class RENDER_PT_eevee_shadows(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene props = scene.eevee @@ -658,6 +677,8 @@ class RENDER_PT_eevee_sampling(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene props = scene.eevee @@ -678,6 +699,8 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene props = scene.eevee @@ -698,15 +721,13 @@ class RENDER_PT_eevee_film(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.use_property_split = True + scene = context.scene rd = scene.render - split = layout.split() - - col = split.column() + col = layout.column() col.prop(rd, "filter_size") - - col = split.column() col.prop(rd, "alpha_mode", text="Alpha") @@ -737,9 +758,9 @@ classes = ( RENDER_PT_context, RENDER_PT_dimensions, RENDER_PT_post_processing, - RENDER_PT_stamp, RENDER_PT_output, RENDER_PT_encoding, + RENDER_PT_stamp, RENDER_UL_renderviews, RENDER_PT_stereoscopy, RENDER_PT_hair, |