[Bf-blender-cvs] [a44d75a9646] master: Icons: Add GPencil Extrude and Radius icons

William Reynish noreply at git.blender.org
Fri Mar 8 13:02:48 CET 2019 

Commit: a44d75a9646cc37b3b6b10decd22db90247795d2
Author: William Reynish
Date:   Fri Mar 8 13:02:46 2019 +0100
Branches: master
https://developer.blender.org/rBa44d75a9646cc37b3b6b10decd22db90247795d2

Icons: Add GPencil Extrude and Radius icons

Also, revision of icons for paint modes, based on suggestions by Aslam Cader.

===================================================================

M	release/datafiles/icons/brush.gpencil_draw.draw.dat
M	release/datafiles/icons/brush.gpencil_draw.erase.dat
M	release/datafiles/icons/brush.gpencil_draw.fill.dat
M	release/datafiles/icons/brush.paint_texture.clone.dat
M	release/datafiles/icons/brush.paint_texture.draw.dat
M	release/datafiles/icons/brush.paint_texture.fill.dat
M	release/datafiles/icons/brush.paint_texture.mask.dat
M	release/datafiles/icons/brush.paint_texture.smear.dat
M	release/datafiles/icons/brush.paint_texture.soften.dat
M	release/datafiles/icons/brush.paint_vertex.average.dat
M	release/datafiles/icons/brush.paint_vertex.blur.dat
M	release/datafiles/icons/brush.paint_vertex.draw.dat
M	release/datafiles/icons/brush.paint_vertex.smear.dat
M	release/datafiles/icons/brush.paint_weight.average.dat
M	release/datafiles/icons/brush.paint_weight.blur.dat
M	release/datafiles/icons/brush.paint_weight.draw.dat
M	release/datafiles/icons/brush.paint_weight.smear.dat
A	release/datafiles/icons/ops.gpencil.extrude_move.dat
M	release/datafiles/icons/ops.gpencil.primitive_arc.dat
M	release/datafiles/icons/ops.gpencil.primitive_box.dat
M	release/datafiles/icons/ops.gpencil.primitive_circle.dat
M	release/datafiles/icons/ops.gpencil.primitive_curve.dat
M	release/datafiles/icons/ops.gpencil.primitive_line.dat
A	release/datafiles/icons/ops.gpencil.radius.dat
M	release/datafiles/icons/ops.gpencil.stroke_cutter.dat
M	release/datafiles/icons/ops.paint.weight_fill.dat
M	release/datafiles/icons/ops.paint.weight_gradient.dat
M	release/datafiles/icons/ops.paint.weight_sample.dat
M	release/datafiles/icons/ops.paint.weight_sample_group.dat
M	release/scripts/startup/bl_ui/properties_output.py
M	source/blender/editors/datafiles/CMakeLists.txt

===================================================================

diff --git a/release/datafiles/icons/brush.gpencil_draw.draw.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat
index 83735672cdb..2bfbae27ba6 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 2adf2747ed5..7a6b69d78dc 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 67ba3fdefab..1a7b71eb975 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 8b1b35bb31a..4ea56d1450a 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 e3871a77a84..cdb4ccf5efb 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 67ba3fdefab..1a7b71eb975 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 0cf6a340a45..29feb1dccb9 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 ec745df2a94..36958641266 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 ba597deff31..8c547809792 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 953e29a8bdd..f082d7ed114 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 ba597deff31..8c547809792 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 e3871a77a84..c1a8796ea02 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 ec745df2a94..694655477db 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 953e29a8bdd..f082d7ed114 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 ba597deff31..8c547809792 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 e3871a77a84..cdb4ccf5efb 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 ec745df2a94..36958641266 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
new file mode 100644
index 00000000000..755e0abd4d4
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.extrude_move.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.primitive_arc.dat b/release/datafiles/icons/ops.gpencil.primitive_arc.dat
index 826748bba4d..8527639fcb9 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 0dabb9271e9..80525d8d929 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 bdc133c1fbc..3bf346eaada 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 e9b970ea346..45a72c145ab 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 153b3120e19..8c64bb59804 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
new file mode 100644
index 00000000000..1c887bc11e7
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.radius.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.stroke_cutter.dat b/release/datafiles/icons/ops.gpencil.stroke_cutter.dat
index d7300d9dd6a..e0cd9aeff6c 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 67ba3fdefab..1a7b71eb975 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 0908966f8a3..43b2c957da2 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 134e371b6f5..01d4194a747 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 827897356dc..78600946d67 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 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
     d

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list