[Bf-blender-cvs] [acab7450784] master: UI: Toolbar icons
William Reynish
noreply at git.blender.org
Sat Mar 14 01:31:36 CET 2020
Commit: acab7450784a555bc03e75405178f6423e2aeb5c
Author: William Reynish
Date: Sat Mar 14 01:31:28 2020 +0100
Branches: master
https://developer.blender.org/rBacab7450784a555bc03e75405178f6423e2aeb5c
UI: Toolbar icons
- Add icons for Sculpt Cloth, Clay Thumb and Draw Face Sets, as well as GP Tint, Replace and Transform Fill tools
- Tweak icons for Sculpt Rotate, Pinch, Multiplane Scrape, Inflate, Blob, Draw Sharp, based on feedback on Devtalk
===================================================================
A release/datafiles/icons/brush.gpencil_draw.tint.dat
A release/datafiles/icons/brush.paint_vertex.replace.dat
M release/datafiles/icons/brush.sculpt.blob.dat
A release/datafiles/icons/brush.sculpt.clay_thumb.dat
A release/datafiles/icons/brush.sculpt.cloth.dat
A release/datafiles/icons/brush.sculpt.draw_face_sets.dat
M release/datafiles/icons/brush.sculpt.draw_sharp.dat
M release/datafiles/icons/brush.sculpt.inflate.dat
M release/datafiles/icons/brush.sculpt.multiplane_scrape.dat
M release/datafiles/icons/brush.sculpt.pinch.dat
M release/datafiles/icons/brush.sculpt.rotate.dat
A release/datafiles/icons/ops.gpencil.transform_fill.dat
M source/blender/editors/datafiles/CMakeLists.txt
===================================================================
diff --git a/release/datafiles/icons/brush.gpencil_draw.tint.dat b/release/datafiles/icons/brush.gpencil_draw.tint.dat
new file mode 100644
index 00000000000..016e4304498
Binary files /dev/null and b/release/datafiles/icons/brush.gpencil_draw.tint.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.replace.dat b/release/datafiles/icons/brush.paint_vertex.replace.dat
new file mode 100644
index 00000000000..a37fdf2e1b1
Binary files /dev/null and b/release/datafiles/icons/brush.paint_vertex.replace.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.blob.dat b/release/datafiles/icons/brush.sculpt.blob.dat
index 7e85ee23fcf..890a73e26a6 100644
Binary files a/release/datafiles/icons/brush.sculpt.blob.dat and b/release/datafiles/icons/brush.sculpt.blob.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.inflate.dat b/release/datafiles/icons/brush.sculpt.clay_thumb.dat
similarity index 51%
copy from release/datafiles/icons/brush.sculpt.inflate.dat
copy to release/datafiles/icons/brush.sculpt.clay_thumb.dat
index 1d131599742..e543185b5d7 100644
Binary files a/release/datafiles/icons/brush.sculpt.inflate.dat and b/release/datafiles/icons/brush.sculpt.clay_thumb.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.cloth.dat b/release/datafiles/icons/brush.sculpt.cloth.dat
new file mode 100644
index 00000000000..5e8fad60035
Binary files /dev/null and b/release/datafiles/icons/brush.sculpt.cloth.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.draw_face_sets.dat b/release/datafiles/icons/brush.sculpt.draw_face_sets.dat
new file mode 100644
index 00000000000..7a05f00ab9d
Binary files /dev/null and b/release/datafiles/icons/brush.sculpt.draw_face_sets.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.draw_sharp.dat b/release/datafiles/icons/brush.sculpt.draw_sharp.dat
index c3e0c7a7536..ad42f4bf870 100644
Binary files a/release/datafiles/icons/brush.sculpt.draw_sharp.dat and b/release/datafiles/icons/brush.sculpt.draw_sharp.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.inflate.dat b/release/datafiles/icons/brush.sculpt.inflate.dat
index 1d131599742..7e85ee23fcf 100644
Binary files a/release/datafiles/icons/brush.sculpt.inflate.dat and b/release/datafiles/icons/brush.sculpt.inflate.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat b/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat
index 98a5b3be902..b785bb51431 100644
Binary files a/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat and b/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.pinch.dat b/release/datafiles/icons/brush.sculpt.pinch.dat
index 4a76c725561..abdb62dcfc8 100644
Binary files a/release/datafiles/icons/brush.sculpt.pinch.dat and b/release/datafiles/icons/brush.sculpt.pinch.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.rotate.dat b/release/datafiles/icons/brush.sculpt.rotate.dat
index 408adde61e1..a0bb63d14db 100644
Binary files a/release/datafiles/icons/brush.sculpt.rotate.dat and b/release/datafiles/icons/brush.sculpt.rotate.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.transform_fill.dat b/release/datafiles/icons/ops.gpencil.transform_fill.dat
new file mode 100644
index 00000000000..a364882d33f
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.transform_fill.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index d1352c66f75..b3bbf2a0bb2 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -606,156 +606,162 @@ set(ICON_NAMES
# This section is maintained by the updating script, keep BEGIN/END comments.
set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
# BEGIN ICON_GEOM_NAMES
- brush.gpencil_draw.draw
- brush.gpencil_draw.erase
- brush.gpencil_draw.fill
- brush.paint_texture.airbrush
- brush.paint_texture.clone
- brush.paint_texture.draw
- brush.paint_texture.fill
- brush.paint_texture.mask
- brush.paint_texture.masklort
- brush.paint_texture.multiply
- brush.paint_texture.smear
- brush.paint_texture.soften
- brush.paint_vertex.alpha
- brush.paint_vertex.average
- brush.paint_vertex.blur
- brush.paint_vertex.draw
- brush.paint_vertex.smear
- brush.paint_weight.average
- brush.paint_weight.blur
- brush.paint_weight.draw
- brush.paint_weight.mix
- brush.paint_weight.smear
- brush.particle.add
- brush.particle.comb
- brush.particle.cut
- brush.particle.length
- brush.particle.puff
- brush.particle.smooth
- brush.particle.weight
- brush.sculpt.blob
- brush.sculpt.clay
- brush.sculpt.clay_strips
- brush.sculpt.crease
- brush.sculpt.draw
- brush.sculpt.draw_sharp
- brush.sculpt.elastic_deform
- brush.sculpt.fill
- brush.sculpt.flatten
- brush.sculpt.grab
- brush.sculpt.inflate
- brush.sculpt.layer
- brush.sculpt.mask
- brush.sculpt.multiplane_scrape
- brush.sculpt.nudge
- brush.sculpt.pinch
- brush.sculpt.pose
- brush.sculpt.rotate
- brush.sculpt.scrape
- brush.sculpt.simplify
- brush.sculpt.smooth
- brush.sculpt.snake_hook
- brush.sculpt.thumb
- brush.sculpt.topology
- brush.uv_sculpt.grab
- brush.uv_sculpt.pinch
- brush.uv_sculpt.relax
- none
- ops.armature.bone.roll
- ops.armature.extrude_cursor
- ops.armature.extrude_move
- ops.curve.draw
- ops.curve.extrude_cursor
- ops.curve.extrude_move
- ops.curve.radius
- ops.curve.vertex_random
- ops.generic.cursor
- ops.generic.select
- ops.generic.select_box
- ops.generic.select_circle
- ops.generic.select_lasso
- ops.gpencil.draw
- ops.gpencil.draw.eraser
- ops.gpencil.draw.line
- ops.gpencil.draw.poly
- ops.gpencil.edit_bend
- 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.primitive_polyline
- ops.gpencil.radius
- ops.gpencil.sculpt_clone
- ops.gpencil.sculpt_grab
- ops.gpencil.sculpt_pinch
- ops.gpencil.sculpt_push
- ops.gpencil.sculpt_randomize
- ops.gpencil.sculpt_smooth
- ops.gpencil.sculpt_strength
- ops.gpencil.sculpt_thickness
- ops.gpencil.sculpt_twist
- ops.gpencil.sculpt_weight
- ops.gpencil.stroke_cutter
- ops.mesh.bevel
- ops.mesh.bisect
- ops.mesh.dupli_extrude_cursor
- ops.mesh.extrude_faces_move
- ops.mesh.extrude_region_move
- ops.mesh.extrude_region_shrink_fatten
- ops.mesh.inset
- ops.mesh.knife_tool
- ops.mesh.loopcut_slide
- ops.mesh.offset_edge_loops_slide
- ops.mesh.polybuild_hover
- ops.mesh.primitive_cone_add_gizmo
- ops.mesh.primitive_cube_add_gizmo
- ops.mesh.primitive_cylinder_add_gizmo
- ops.mesh.primitive_grid_add_gizmo
- ops.mesh.primitive_sphere_add_gizmo
- ops.mesh.primitive_torus_add_gizmo
- ops.mesh.rip
- ops.mesh.rip_edge
- ops.mesh.spin
- ops.mesh.spin.duplicate
- ops.mesh.vertices_smooth
- ops.node.links_cut
- ops.paint.eyedropper_add
- ops.paint.vertex_color_fill
- ops.paint.weight_fill
- ops.paint.weight_gradient
- ops.paint.weight_sample
- ops.paint.weight_sample_group
- ops.pose.breakdowner
- ops.pose.push
- ops.pose.relax
- ops.sculpt.border_hide
- ops.sculpt.border_mask
- ops.sculpt.lasso_mask
- ops.sculpt.mesh_filter
- ops.sequencer.blade
- ops.transform.bone_envelope
- ops.transform.bone_size
- ops.transform.edge_slide
- ops.transform.push_pull
- ops.transform.resize.cage
- ops.transform.resize
- ops.transform.rotate
- ops.transform.shear
- ops.transform.shrink_fatten
- ops.transform.tilt
- ops.transform.tosphere
- ops.transform.transform
- ops.transform.translate
- ops.transform.vert_slide
- ops.transform.vertex_random
- ops.view3d.ruler
+ brush.gpencil_draw.draw
+ brush.gpencil_draw.erase
+ brush.gpencil_draw.fill
+ brush.gpencil_draw.tint
+ brush.paint_texture.airbrush
+ brush.paint_texture.clone
+ brush.paint_texture.draw
+ brush.paint_texture.fill
+ brush.paint_texture.mask
+ brush.paint_texture.masklort
+ brush.paint_texture.multiply
+ brush.paint_texture.smear
+ brush.paint_texture.soften
+ brush.paint_vertex.alpha
+ brush.paint_vertex.average
+ brush.paint_vertex.blur
+ brush.paint_vertex.draw
+ brush.paint_vertex.replace
+ brush.paint_vertex.smear
+ brush.paint_weight.average
+ brush.paint_weight.blur
+ brush.paint_weight.draw
+ brush.paint_weight.mix
+ brush.paint_weight.smear
+ brush.particle.add
+ brush.particle.comb
+ brush.particle.cut
+ brush.particle.length
+ brush.particle.puff
+ brush.particle.smooth
+ brush.particle.weight
+ brush.sculpt.blob
+ brush.sculpt.clay
+ brush.sculpt.clay_strips
+ brush.sculpt.clay_thumb
+ brush.sculpt.cloth
+ brush.sculpt.crease
+ brush.sculpt.draw
+ brush.sculpt.draw_face_sets
+ brush.sculpt.draw_sharp
+ brush.sculpt.elastic_deform
+ brush.sculpt.fill
+ brush.sculpt.flatten
+ brush.sculpt.grab
+ brush.sculpt.inflate
+ brush.sculpt.layer
+ brush.sculpt.mask
+ brush.sculpt.multiplane_scrape
+ brush.sculpt.nudge
+ brush.sculpt.pinch
+ brush.sculpt.pose
+ brush.sculpt.rotate
+ brush.sculpt.scrape
+ brush.sculpt.simplify
+ brush.sculpt.smooth
+ brush.sculpt.snake_hook
+ brush.sculpt.thumb
+ brush.sculpt.topology
+ brush.uv_sculpt.grab
+ brush.uv_sculpt.pinch
+ brush.uv_sculpt.relax
+ none
+ ops.armature.bone.roll
+ ops.armature.extrude_cursor
+ ops.armature.extrude_move
+ ops.curve.draw
+ ops.curve.extrude_cursor
+ ops.curve.extrude_move
+ ops.curve.radius
+ ops.curve.vertex_random
+ ops.generic.cursor
+ ops.generic.select
+ ops.generic.select_box
+ ops.generic.select_circle
+ ops.generic.select_lasso
+ ops.gpencil.draw
+ ops.gpencil.draw.eraser
+ ops.gpencil.draw.line
+ ops.gpencil.draw.poly
+ ops.gpencil.edit_bend
+ 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.primitive_polyline
+ ops.gpencil.radius
+ ops.gpencil.sculpt_clone
+ ops.gpencil.sculpt_grab
+ ops.gpencil.sculpt_pinch
+ ops.gpencil.sculpt_push
+ ops.gpenc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list