diff options
author | William Reynish <billrey@me.com> | 2019-03-08 15:02:46 +0300 |
---|---|---|
committer | William Reynish <billrey@me.com> | 2019-03-08 15:02:46 +0300 |
commit | a44d75a9646cc37b3b6b10decd22db90247795d2 (patch) | |
tree | 05b99a2f467b701307c7b5dc9051fed116befd5e /release | |
parent | 49b9b159e4a4baaf48b121edf66d3436873dfc48 (diff) |
Icons: Add GPencil Extrude and Radius icons
Also, revision of icons for paint modes, based on suggestions by Aslam Cader.
Diffstat (limited to 'release')
30 files changed, 39 insertions, 25 deletions
diff --git a/release/datafiles/icons/brush.gpencil_draw.draw.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat Binary files differindex 83735672cdb..2bfbae27ba6 100644 --- a/release/datafiles/icons/brush.gpencil_draw.draw.dat +++ b/release/datafiles/icons/brush.gpencil_draw.draw.dat diff --git a/release/datafiles/icons/brush.gpencil_draw.erase.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat Binary files differindex 2adf2747ed5..7a6b69d78dc 100644 --- a/release/datafiles/icons/brush.gpencil_draw.erase.dat +++ b/release/datafiles/icons/brush.gpencil_draw.erase.dat diff --git a/release/datafiles/icons/brush.gpencil_draw.fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat Binary files differindex 67ba3fdefab..1a7b71eb975 100644 --- a/release/datafiles/icons/brush.gpencil_draw.fill.dat +++ b/release/datafiles/icons/brush.gpencil_draw.fill.dat diff --git a/release/datafiles/icons/brush.paint_texture.clone.dat b/release/datafiles/icons/brush.paint_texture.clone.dat Binary files differindex 8b1b35bb31a..4ea56d1450a 100644 --- a/release/datafiles/icons/brush.paint_texture.clone.dat +++ b/release/datafiles/icons/brush.paint_texture.clone.dat diff --git a/release/datafiles/icons/brush.paint_texture.draw.dat b/release/datafiles/icons/brush.paint_texture.draw.dat Binary files differindex e3871a77a84..cdb4ccf5efb 100644 --- a/release/datafiles/icons/brush.paint_texture.draw.dat +++ b/release/datafiles/icons/brush.paint_texture.draw.dat diff --git a/release/datafiles/icons/brush.paint_texture.fill.dat b/release/datafiles/icons/brush.paint_texture.fill.dat Binary files differindex 67ba3fdefab..1a7b71eb975 100644 --- a/release/datafiles/icons/brush.paint_texture.fill.dat +++ b/release/datafiles/icons/brush.paint_texture.fill.dat diff --git a/release/datafiles/icons/brush.paint_texture.mask.dat b/release/datafiles/icons/brush.paint_texture.mask.dat Binary files differindex 0cf6a340a45..29feb1dccb9 100644 --- a/release/datafiles/icons/brush.paint_texture.mask.dat +++ b/release/datafiles/icons/brush.paint_texture.mask.dat diff --git a/release/datafiles/icons/brush.paint_texture.smear.dat b/release/datafiles/icons/brush.paint_texture.smear.dat Binary files differindex ec745df2a94..36958641266 100644 --- a/release/datafiles/icons/brush.paint_texture.smear.dat +++ b/release/datafiles/icons/brush.paint_texture.smear.dat diff --git a/release/datafiles/icons/brush.paint_texture.soften.dat b/release/datafiles/icons/brush.paint_texture.soften.dat Binary files differindex ba597deff31..8c547809792 100644 --- a/release/datafiles/icons/brush.paint_texture.soften.dat +++ b/release/datafiles/icons/brush.paint_texture.soften.dat diff --git a/release/datafiles/icons/brush.paint_vertex.average.dat b/release/datafiles/icons/brush.paint_vertex.average.dat Binary files differindex 953e29a8bdd..f082d7ed114 100644 --- a/release/datafiles/icons/brush.paint_vertex.average.dat +++ b/release/datafiles/icons/brush.paint_vertex.average.dat diff --git a/release/datafiles/icons/brush.paint_vertex.blur.dat b/release/datafiles/icons/brush.paint_vertex.blur.dat Binary files differindex ba597deff31..8c547809792 100644 --- a/release/datafiles/icons/brush.paint_vertex.blur.dat +++ b/release/datafiles/icons/brush.paint_vertex.blur.dat diff --git a/release/datafiles/icons/brush.paint_vertex.draw.dat b/release/datafiles/icons/brush.paint_vertex.draw.dat Binary files differindex e3871a77a84..c1a8796ea02 100644 --- a/release/datafiles/icons/brush.paint_vertex.draw.dat +++ b/release/datafiles/icons/brush.paint_vertex.draw.dat diff --git a/release/datafiles/icons/brush.paint_vertex.smear.dat b/release/datafiles/icons/brush.paint_vertex.smear.dat Binary files differindex ec745df2a94..694655477db 100644 --- a/release/datafiles/icons/brush.paint_vertex.smear.dat +++ b/release/datafiles/icons/brush.paint_vertex.smear.dat diff --git a/release/datafiles/icons/brush.paint_weight.average.dat b/release/datafiles/icons/brush.paint_weight.average.dat Binary files differindex 953e29a8bdd..f082d7ed114 100644 --- a/release/datafiles/icons/brush.paint_weight.average.dat +++ b/release/datafiles/icons/brush.paint_weight.average.dat diff --git a/release/datafiles/icons/brush.paint_weight.blur.dat b/release/datafiles/icons/brush.paint_weight.blur.dat Binary files differindex ba597deff31..8c547809792 100644 --- a/release/datafiles/icons/brush.paint_weight.blur.dat +++ b/release/datafiles/icons/brush.paint_weight.blur.dat diff --git a/release/datafiles/icons/brush.paint_weight.draw.dat b/release/datafiles/icons/brush.paint_weight.draw.dat Binary files differindex e3871a77a84..cdb4ccf5efb 100644 --- a/release/datafiles/icons/brush.paint_weight.draw.dat +++ b/release/datafiles/icons/brush.paint_weight.draw.dat diff --git a/release/datafiles/icons/brush.paint_weight.smear.dat b/release/datafiles/icons/brush.paint_weight.smear.dat Binary files differindex ec745df2a94..36958641266 100644 --- a/release/datafiles/icons/brush.paint_weight.smear.dat +++ b/release/datafiles/icons/brush.paint_weight.smear.dat diff --git a/release/datafiles/icons/ops.gpencil.extrude_move.dat b/release/datafiles/icons/ops.gpencil.extrude_move.dat Binary files differnew file mode 100644 index 00000000000..755e0abd4d4 --- /dev/null +++ b/release/datafiles/icons/ops.gpencil.extrude_move.dat diff --git a/release/datafiles/icons/ops.gpencil.primitive_arc.dat b/release/datafiles/icons/ops.gpencil.primitive_arc.dat Binary files differindex 826748bba4d..8527639fcb9 100644 --- a/release/datafiles/icons/ops.gpencil.primitive_arc.dat +++ b/release/datafiles/icons/ops.gpencil.primitive_arc.dat diff --git a/release/datafiles/icons/ops.gpencil.primitive_box.dat b/release/datafiles/icons/ops.gpencil.primitive_box.dat Binary files differindex 0dabb9271e9..80525d8d929 100644 --- a/release/datafiles/icons/ops.gpencil.primitive_box.dat +++ b/release/datafiles/icons/ops.gpencil.primitive_box.dat diff --git a/release/datafiles/icons/ops.gpencil.primitive_circle.dat b/release/datafiles/icons/ops.gpencil.primitive_circle.dat Binary files differindex bdc133c1fbc..3bf346eaada 100644 --- a/release/datafiles/icons/ops.gpencil.primitive_circle.dat +++ b/release/datafiles/icons/ops.gpencil.primitive_circle.dat diff --git a/release/datafiles/icons/ops.gpencil.primitive_curve.dat b/release/datafiles/icons/ops.gpencil.primitive_curve.dat Binary files differindex e9b970ea346..45a72c145ab 100644 --- a/release/datafiles/icons/ops.gpencil.primitive_curve.dat +++ b/release/datafiles/icons/ops.gpencil.primitive_curve.dat diff --git a/release/datafiles/icons/ops.gpencil.primitive_line.dat b/release/datafiles/icons/ops.gpencil.primitive_line.dat Binary files differindex 153b3120e19..8c64bb59804 100644 --- a/release/datafiles/icons/ops.gpencil.primitive_line.dat +++ b/release/datafiles/icons/ops.gpencil.primitive_line.dat diff --git a/release/datafiles/icons/ops.gpencil.radius.dat b/release/datafiles/icons/ops.gpencil.radius.dat Binary files differnew file mode 100644 index 00000000000..1c887bc11e7 --- /dev/null +++ b/release/datafiles/icons/ops.gpencil.radius.dat diff --git a/release/datafiles/icons/ops.gpencil.stroke_cutter.dat b/release/datafiles/icons/ops.gpencil.stroke_cutter.dat Binary files differindex d7300d9dd6a..e0cd9aeff6c 100644 --- a/release/datafiles/icons/ops.gpencil.stroke_cutter.dat +++ b/release/datafiles/icons/ops.gpencil.stroke_cutter.dat diff --git a/release/datafiles/icons/ops.paint.weight_fill.dat b/release/datafiles/icons/ops.paint.weight_fill.dat Binary files differindex 67ba3fdefab..1a7b71eb975 100644 --- a/release/datafiles/icons/ops.paint.weight_fill.dat +++ b/release/datafiles/icons/ops.paint.weight_fill.dat diff --git a/release/datafiles/icons/ops.paint.weight_gradient.dat b/release/datafiles/icons/ops.paint.weight_gradient.dat Binary files differindex 0908966f8a3..43b2c957da2 100644 --- a/release/datafiles/icons/ops.paint.weight_gradient.dat +++ b/release/datafiles/icons/ops.paint.weight_gradient.dat diff --git a/release/datafiles/icons/ops.paint.weight_sample.dat b/release/datafiles/icons/ops.paint.weight_sample.dat Binary files differindex 134e371b6f5..01d4194a747 100644 --- a/release/datafiles/icons/ops.paint.weight_sample.dat +++ b/release/datafiles/icons/ops.paint.weight_sample.dat diff --git a/release/datafiles/icons/ops.paint.weight_sample_group.dat b/release/datafiles/icons/ops.paint.weight_sample_group.dat Binary files differindex 827897356dc..78600946d67 100644 --- a/release/datafiles/icons/ops.paint.weight_sample_group.dat +++ b/release/datafiles/icons/ops.paint.weight_sample_group.dat diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py index bd96152204a..3d810a55b0e 100644 --- a/release/scripts/startup/bl_ui/properties_output.py +++ b/release/scripts/startup/bl_ui/properties_output.py @@ -54,21 +54,18 @@ class RenderOutputButtonsPanel: return (context.engine in cls.COMPAT_ENGINES) -class RENDER_PT_dimensions(RenderOutputButtonsPanel, Panel): - bl_label = "Dimensions" +class RENDER_PT_format(RenderOutputButtonsPanel, Panel): + bl_label = "Project Format" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} - _frame_rate_args_prev = None _preset_class = None - - def draw_header_preset(self, context): - RENDER_PT_presets.draw_panel_header(self.layout) + _frame_rate_args_prev = None @staticmethod def _draw_framerate_label(*args): # avoids re-creating text string each draw - if RENDER_PT_dimensions._frame_rate_args_prev == args: - return RENDER_PT_dimensions._frame_rate_ret + if RENDER_PT_format._frame_rate_args_prev == args: + return RENDER_PT_format._frame_rate_ret fps, fps_base, preset_label = args @@ -87,17 +84,17 @@ class RENDER_PT_dimensions(RenderOutputButtonsPanel, Panel): fps_label_text = f"{fps_rate!r} fps" show_framerate = (preset_label == "Custom") - RENDER_PT_dimensions._frame_rate_args_prev = args - RENDER_PT_dimensions._frame_rate_ret = args = (fps_label_text, show_framerate) + RENDER_PT_format._frame_rate_args_prev = args + RENDER_PT_format._frame_rate_ret = args = (fps_label_text, show_framerate) return args @staticmethod def draw_framerate(layout, sub, rd): - if RENDER_PT_dimensions._preset_class is None: - RENDER_PT_dimensions._preset_class = bpy.types.RENDER_MT_framerate_presets + if RENDER_PT_format._preset_class is None: + RENDER_PT_format._preset_class = bpy.types.RENDER_MT_framerate_presets - 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) + 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) sub.menu("RENDER_MT_framerate_presets", text=fps_label_text) @@ -106,6 +103,9 @@ class RENDER_PT_dimensions(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_dimensions(RenderOutputButtonsPanel, Panel): col.prop(rd, "resolution_percentage", text="%") col = layout.column(align=True) - col.prop(rd, "pixel_aspect_x", text="Aspect X") + col.prop(rd, "pixel_aspect_x", text="Aspect Ratio X") col.prop(rd, "pixel_aspect_y", text="Y") col = layout.column(align=True) @@ -129,20 +129,33 @@ class RENDER_PT_dimensions(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_remapping(RenderOutputButtonsPanel, Panel): - bl_label = "Time Remapping" - bl_parent_id = "RENDER_PT_dimensions" +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" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} @@ -504,8 +517,9 @@ classes = ( RENDER_PT_presets, RENDER_PT_ffmpeg_presets, RENDER_MT_framerate_presets, - RENDER_PT_dimensions, - RENDER_PT_frame_remapping, + RENDER_PT_format, + RENDER_PT_frame_range, + RENDER_PT_time_frame_remapping, RENDER_PT_output, RENDER_PT_output_views, RENDER_PT_encoding, |