diff --git a/release/datafiles/icons/brush.gpencil_draw.draw.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat index 2bfbae27ba6..83735672cdb 100644 Binary files a/release/datafiles/icons/brush.gpencil_draw.draw.dat and b/release/datafiles/icons/brush.gpencil_draw.draw.dat differ diff --git a/release/datafiles/icons/brush.gpencil_draw.erase.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat index 7a6b69d78dc..2adf2747ed5 100644 Binary files a/release/datafiles/icons/brush.gpencil_draw.erase.dat and b/release/datafiles/icons/brush.gpencil_draw.erase.dat differ diff --git a/release/datafiles/icons/brush.gpencil_draw.fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat index 1a7b71eb975..67ba3fdefab 100644 Binary files a/release/datafiles/icons/brush.gpencil_draw.fill.dat and b/release/datafiles/icons/brush.gpencil_draw.fill.dat differ diff --git a/release/datafiles/icons/brush.paint_texture.clone.dat b/release/datafiles/icons/brush.paint_texture.clone.dat index 4ea56d1450a..8b1b35bb31a 100644 Binary files a/release/datafiles/icons/brush.paint_texture.clone.dat and b/release/datafiles/icons/brush.paint_texture.clone.dat differ diff --git a/release/datafiles/icons/brush.paint_texture.draw.dat b/release/datafiles/icons/brush.paint_texture.draw.dat index cdb4ccf5efb..e3871a77a84 100644 Binary files a/release/datafiles/icons/brush.paint_texture.draw.dat and b/release/datafiles/icons/brush.paint_texture.draw.dat differ diff --git a/release/datafiles/icons/brush.paint_texture.fill.dat b/release/datafiles/icons/brush.paint_texture.fill.dat index 1a7b71eb975..67ba3fdefab 100644 Binary files a/release/datafiles/icons/brush.paint_texture.fill.dat and b/release/datafiles/icons/brush.paint_texture.fill.dat differ diff --git a/release/datafiles/icons/brush.paint_texture.mask.dat b/release/datafiles/icons/brush.paint_texture.mask.dat index 29feb1dccb9..0cf6a340a45 100644 Binary files a/release/datafiles/icons/brush.paint_texture.mask.dat and b/release/datafiles/icons/brush.paint_texture.mask.dat differ diff --git a/release/datafiles/icons/brush.paint_texture.smear.dat b/release/datafiles/icons/brush.paint_texture.smear.dat index 36958641266..ec745df2a94 100644 Binary files a/release/datafiles/icons/brush.paint_texture.smear.dat and b/release/datafiles/icons/brush.paint_texture.smear.dat differ diff --git a/release/datafiles/icons/brush.paint_texture.soften.dat b/release/datafiles/icons/brush.paint_texture.soften.dat index 8c547809792..ba597deff31 100644 Binary files a/release/datafiles/icons/brush.paint_texture.soften.dat and b/release/datafiles/icons/brush.paint_texture.soften.dat differ diff --git a/release/datafiles/icons/brush.paint_vertex.average.dat b/release/datafiles/icons/brush.paint_vertex.average.dat index f082d7ed114..953e29a8bdd 100644 Binary files a/release/datafiles/icons/brush.paint_vertex.average.dat and b/release/datafiles/icons/brush.paint_vertex.average.dat differ diff --git a/release/datafiles/icons/brush.paint_vertex.blur.dat b/release/datafiles/icons/brush.paint_vertex.blur.dat index 8c547809792..ba597deff31 100644 Binary files a/release/datafiles/icons/brush.paint_vertex.blur.dat and b/release/datafiles/icons/brush.paint_vertex.blur.dat differ diff --git a/release/datafiles/icons/brush.paint_vertex.draw.dat b/release/datafiles/icons/brush.paint_vertex.draw.dat index c1a8796ea02..e3871a77a84 100644 Binary files a/release/datafiles/icons/brush.paint_vertex.draw.dat and b/release/datafiles/icons/brush.paint_vertex.draw.dat differ diff --git a/release/datafiles/icons/brush.paint_vertex.smear.dat b/release/datafiles/icons/brush.paint_vertex.smear.dat index 694655477db..ec745df2a94 100644 Binary files a/release/datafiles/icons/brush.paint_vertex.smear.dat and b/release/datafiles/icons/brush.paint_vertex.smear.dat differ diff --git a/release/datafiles/icons/brush.paint_weight.average.dat b/release/datafiles/icons/brush.paint_weight.average.dat index f082d7ed114..953e29a8bdd 100644 Binary files a/release/datafiles/icons/brush.paint_weight.average.dat and b/release/datafiles/icons/brush.paint_weight.average.dat differ diff --git a/release/datafiles/icons/brush.paint_weight.blur.dat b/release/datafiles/icons/brush.paint_weight.blur.dat index 8c547809792..ba597deff31 100644 Binary files a/release/datafiles/icons/brush.paint_weight.blur.dat and b/release/datafiles/icons/brush.paint_weight.blur.dat differ diff --git a/release/datafiles/icons/brush.paint_weight.draw.dat b/release/datafiles/icons/brush.paint_weight.draw.dat index cdb4ccf5efb..e3871a77a84 100644 Binary files a/release/datafiles/icons/brush.paint_weight.draw.dat and b/release/datafiles/icons/brush.paint_weight.draw.dat differ diff --git a/release/datafiles/icons/brush.paint_weight.smear.dat b/release/datafiles/icons/brush.paint_weight.smear.dat index 36958641266..ec745df2a94 100644 Binary files a/release/datafiles/icons/brush.paint_weight.smear.dat and b/release/datafiles/icons/brush.paint_weight.smear.dat differ diff --git a/release/datafiles/icons/ops.gpencil.extrude_move.dat b/release/datafiles/icons/ops.gpencil.extrude_move.dat deleted file mode 100644 index 755e0abd4d4..00000000000 Binary files a/release/datafiles/icons/ops.gpencil.extrude_move.dat and /dev/null differ diff --git a/release/datafiles/icons/ops.gpencil.primitive_arc.dat b/release/datafiles/icons/ops.gpencil.primitive_arc.dat index 8527639fcb9..826748bba4d 100644 Binary files a/release/datafiles/icons/ops.gpencil.primitive_arc.dat and b/release/datafiles/icons/ops.gpencil.primitive_arc.dat differ diff --git a/release/datafiles/icons/ops.gpencil.primitive_box.dat b/release/datafiles/icons/ops.gpencil.primitive_box.dat index 80525d8d929..0dabb9271e9 100644 Binary files a/release/datafiles/icons/ops.gpencil.primitive_box.dat and b/release/datafiles/icons/ops.gpencil.primitive_box.dat differ diff --git a/release/datafiles/icons/ops.gpencil.primitive_circle.dat b/release/datafiles/icons/ops.gpencil.primitive_circle.dat index 3bf346eaada..bdc133c1fbc 100644 Binary files a/release/datafiles/icons/ops.gpencil.primitive_circle.dat and b/release/datafiles/icons/ops.gpencil.primitive_circle.dat differ diff --git a/release/datafiles/icons/ops.gpencil.primitive_curve.dat b/release/datafiles/icons/ops.gpencil.primitive_curve.dat index 45a72c145ab..e9b970ea346 100644 Binary files a/release/datafiles/icons/ops.gpencil.primitive_curve.dat and b/release/datafiles/icons/ops.gpencil.primitive_curve.dat differ diff --git a/release/datafiles/icons/ops.gpencil.primitive_line.dat b/release/datafiles/icons/ops.gpencil.primitive_line.dat index 8c64bb59804..153b3120e19 100644 Binary files a/release/datafiles/icons/ops.gpencil.primitive_line.dat and b/release/datafiles/icons/ops.gpencil.primitive_line.dat differ diff --git a/release/datafiles/icons/ops.gpencil.radius.dat b/release/datafiles/icons/ops.gpencil.radius.dat deleted file mode 100644 index 1c887bc11e7..00000000000 Binary files a/release/datafiles/icons/ops.gpencil.radius.dat and /dev/null differ diff --git a/release/datafiles/icons/ops.gpencil.stroke_cutter.dat b/release/datafiles/icons/ops.gpencil.stroke_cutter.dat index e0cd9aeff6c..d7300d9dd6a 100644 Binary files a/release/datafiles/icons/ops.gpencil.stroke_cutter.dat and b/release/datafiles/icons/ops.gpencil.stroke_cutter.dat differ diff --git a/release/datafiles/icons/ops.paint.weight_fill.dat b/release/datafiles/icons/ops.paint.weight_fill.dat index 1a7b71eb975..67ba3fdefab 100644 Binary files a/release/datafiles/icons/ops.paint.weight_fill.dat and b/release/datafiles/icons/ops.paint.weight_fill.dat differ diff --git a/release/datafiles/icons/ops.paint.weight_gradient.dat b/release/datafiles/icons/ops.paint.weight_gradient.dat index 43b2c957da2..0908966f8a3 100644 Binary files a/release/datafiles/icons/ops.paint.weight_gradient.dat and b/release/datafiles/icons/ops.paint.weight_gradient.dat differ diff --git a/release/datafiles/icons/ops.paint.weight_sample.dat b/release/datafiles/icons/ops.paint.weight_sample.dat index 01d4194a747..134e371b6f5 100644 Binary files a/release/datafiles/icons/ops.paint.weight_sample.dat and b/release/datafiles/icons/ops.paint.weight_sample.dat differ diff --git a/release/datafiles/icons/ops.paint.weight_sample_group.dat b/release/datafiles/icons/ops.paint.weight_sample_group.dat index 78600946d67..827897356dc 100644 Binary files a/release/datafiles/icons/ops.paint.weight_sample_group.dat and b/release/datafiles/icons/ops.paint.weight_sample_group.dat differ diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py index 3d810a55b0e..bd96152204a 100644 --- a/release/scripts/startup/bl_ui/properties_output.py +++ b/release/scripts/startup/bl_ui/properties_output.py @@ -54,18 +54,21 @@ class RenderOutputButtonsPanel: return (context.engine in cls.COMPAT_ENGINES) -class RENDER_PT_format(RenderOutputButtonsPanel, Panel): - bl_label = "Project Format" +class RENDER_PT_dimensions(RenderOutputButtonsPanel, Panel): + bl_label = "Dimensions" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} - _preset_class = None _frame_rate_args_prev = None + _preset_class = None + + def draw_header_preset(self, context): + RENDER_PT_presets.draw_panel_header(self.layout) @staticmethod def _draw_framerate_label(*args): # avoids re-creating text string each draw - if RENDER_PT_format._frame_rate_args_prev == args: - return RENDER_PT_format._frame_rate_ret + if RENDER_PT_dimensions._frame_rate_args_prev == args: + return RENDER_PT_dimensions._frame_rate_ret fps, fps_base, preset_label = args @@ -84,17 +87,17 @@ class RENDER_PT_format(RenderOutputButtonsPanel, Panel): fps_label_text = f"{fps_rate!r} fps" show_framerate = (preset_label == "Custom") - RENDER_PT_format._frame_rate_args_prev = args - RENDER_PT_format._frame_rate_ret = args = (fps_label_text, show_framerate) + RENDER_PT_dimensions._frame_rate_args_prev = args + RENDER_PT_dimensions._frame_rate_ret = args = (fps_label_text, show_framerate) return args @staticmethod def draw_framerate(layout, sub, rd): - if RENDER_PT_format._preset_class is None: - RENDER_PT_format._preset_class = bpy.types.RENDER_MT_framerate_presets + if RENDER_PT_dimensions._preset_class is None: + RENDER_PT_dimensions._preset_class = bpy.types.RENDER_MT_framerate_presets - args = rd.fps, rd.fps_base, RENDER_PT_format._preset_class.bl_label - fps_label_text, show_framerate = RENDER_PT_format._draw_framerate_label(*args) + args = rd.fps, rd.fps_base, RENDER_PT_dimensions._preset_class.bl_label + fps_label_text, show_framerate = RENDER_PT_dimensions._draw_framerate_label(*args) sub.menu("RENDER_MT_framerate_presets", text=fps_label_text) @@ -103,9 +106,6 @@ class RENDER_PT_format(RenderOutputButtonsPanel, Panel): col.prop(rd, "fps") col.prop(rd, "fps_base", text="Base") - def draw_header_preset(self, context): - RENDER_PT_presets.draw_panel_header(self.layout) - def draw(self, context): layout = self.layout layout.use_property_split = True @@ -120,7 +120,7 @@ class RENDER_PT_format(RenderOutputButtonsPanel, Panel): col.prop(rd, "resolution_percentage", text="%") col = layout.column(align=True) - col.prop(rd, "pixel_aspect_x", text="Aspect Ratio X") + col.prop(rd, "pixel_aspect_x", text="Aspect X") col.prop(rd, "pixel_aspect_y", text="Y") col = layout.column(align=True) @@ -129,33 +129,20 @@ class RENDER_PT_format(RenderOutputButtonsPanel, Panel): sub.active = rd.use_border sub.prop(rd, "use_crop_to_border") + col = layout.column(align=True) + col.prop(scene, "frame_start", text="Frame Start") + col.prop(scene, "frame_end", text="End") + col.prop(scene, "frame_step", text="Step") + col = layout.split() col.alignment = 'RIGHT' col.label(text="Frame Rate") self.draw_framerate(layout, col, rd) -class RENDER_PT_frame_range(RenderOutputButtonsPanel, Panel): - bl_label = "Frame Range" - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} - - def draw(self, context): - layout = self.layout - layout.use_property_split = True - layout.use_property_decorate = False # No animation. - - scene = context.scene - rd = scene.render - - col = layout.column(align=True) - col.prop(scene, "frame_start", text="Frame Start") - col.prop(scene, "frame_end", text="End") - col.prop(scene, "frame_step", text="Step") - - -class RENDER_PT_time_frame_remapping(RenderOutputButtonsPanel, Panel): - bl_label = "Time Stretching" - bl_parent_id = "RENDER_PT_frame_range" +class RENDER_PT_frame_remapping(RenderOutputButtonsPanel, Panel): + bl_label = "Time Remapping" + bl_parent_id = "RENDER_PT_dimensions" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} @@ -517,9 +504,8 @@ classes = ( RENDER_PT_presets, RENDER_PT_ffmpeg_presets, RENDER_MT_framerate_presets, - RENDER_PT_format, - RENDER_PT_frame_range, - RENDER_PT_time_frame_remapping, + RENDER_PT_dimensions, + RENDER_PT_frame_remapping, RENDER_PT_output, RENDER_PT_output_views, RENDER_PT_encoding, diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 325a369ef7e..c116254ebc9 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -683,13 +683,11 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES ops.gpencil.edit_mirror ops.gpencil.edit_shear ops.gpencil.edit_to_sphere - ops.gpencil.extrude_move ops.gpencil.primitive_arc ops.gpencil.primitive_box ops.gpencil.primitive_circle ops.gpencil.primitive_curve ops.gpencil.primitive_line - ops.gpencil.radius ops.gpencil.sculpt_clone ops.gpencil.sculpt_grab ops.gpencil.sculpt_pinch