diff --git a/release/datafiles/brushicons/blob.png b/release/datafiles/brushicons/blob.png deleted file mode 100644 index 2deb42c9dad..00000000000 Binary files a/release/datafiles/brushicons/blob.png and /dev/null differ diff --git a/release/datafiles/brushicons/blur.png b/release/datafiles/brushicons/blur.png deleted file mode 100644 index 93636abbe56..00000000000 Binary files a/release/datafiles/brushicons/blur.png and /dev/null differ diff --git a/release/datafiles/brushicons/clay.png b/release/datafiles/brushicons/clay.png deleted file mode 100644 index 27ea974a833..00000000000 Binary files a/release/datafiles/brushicons/clay.png and /dev/null differ diff --git a/release/datafiles/brushicons/claystrips.png b/release/datafiles/brushicons/claystrips.png deleted file mode 100644 index f8efc33dab4..00000000000 Binary files a/release/datafiles/brushicons/claystrips.png and /dev/null differ diff --git a/release/datafiles/brushicons/clone.png b/release/datafiles/brushicons/clone.png deleted file mode 100644 index ce5e418bb79..00000000000 Binary files a/release/datafiles/brushicons/clone.png and /dev/null differ diff --git a/release/datafiles/brushicons/crease.png b/release/datafiles/brushicons/crease.png deleted file mode 100644 index b2be546ac03..00000000000 Binary files a/release/datafiles/brushicons/crease.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_add.png b/release/datafiles/brushicons/curves_sculpt_add.png deleted file mode 100644 index e8b81b73919..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_add.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_comb.png b/release/datafiles/brushicons/curves_sculpt_comb.png deleted file mode 100644 index bdf49e413e3..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_comb.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_cut.png b/release/datafiles/brushicons/curves_sculpt_cut.png deleted file mode 100644 index 7f9e116fcd1..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_cut.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_delete.png b/release/datafiles/brushicons/curves_sculpt_delete.png deleted file mode 100644 index 361b8e335a5..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_delete.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_density.png b/release/datafiles/brushicons/curves_sculpt_density.png deleted file mode 100644 index 305fa02298f..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_density.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_grow_shrink.png b/release/datafiles/brushicons/curves_sculpt_grow_shrink.png deleted file mode 100644 index e4a76c6d6e4..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_grow_shrink.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_pinch.png b/release/datafiles/brushicons/curves_sculpt_pinch.png deleted file mode 100644 index cc98203ef57..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_pinch.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_puff.png b/release/datafiles/brushicons/curves_sculpt_puff.png deleted file mode 100644 index e5b48b8a96c..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_puff.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_slide.png b/release/datafiles/brushicons/curves_sculpt_slide.png deleted file mode 100644 index 7627cf76791..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_slide.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_smooth.png b/release/datafiles/brushicons/curves_sculpt_smooth.png deleted file mode 100644 index 7c7fd8fef4a..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_smooth.png and /dev/null differ diff --git a/release/datafiles/brushicons/curves_sculpt_snake_hook.png b/release/datafiles/brushicons/curves_sculpt_snake_hook.png deleted file mode 100644 index 468abe66c08..00000000000 Binary files a/release/datafiles/brushicons/curves_sculpt_snake_hook.png and /dev/null differ diff --git a/release/datafiles/brushicons/draw.png b/release/datafiles/brushicons/draw.png deleted file mode 100644 index 6d0666a6586..00000000000 Binary files a/release/datafiles/brushicons/draw.png and /dev/null differ diff --git a/release/datafiles/brushicons/fill.png b/release/datafiles/brushicons/fill.png deleted file mode 100644 index 6152a91e9e0..00000000000 Binary files a/release/datafiles/brushicons/fill.png and /dev/null differ diff --git a/release/datafiles/brushicons/flatten.png b/release/datafiles/brushicons/flatten.png deleted file mode 100644 index 53e807cf811..00000000000 Binary files a/release/datafiles/brushicons/flatten.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_airbrush.png b/release/datafiles/brushicons/gp_brush_airbrush.png deleted file mode 100644 index 3c9aa4273bf..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_airbrush.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_block.png b/release/datafiles/brushicons/gp_brush_block.png deleted file mode 100644 index 2db3964e573..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_block.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_chisel.png b/release/datafiles/brushicons/gp_brush_chisel.png deleted file mode 100644 index 6fa5071e9be..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_chisel.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_clone.png b/release/datafiles/brushicons/gp_brush_clone.png deleted file mode 100644 index 8358ace23b3..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_clone.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_erase_hard.png b/release/datafiles/brushicons/gp_brush_erase_hard.png deleted file mode 100644 index 2ac52840678..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_erase_hard.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_erase_soft.png b/release/datafiles/brushicons/gp_brush_erase_soft.png deleted file mode 100644 index 416923004dd..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_erase_soft.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_erase_stroke.png b/release/datafiles/brushicons/gp_brush_erase_stroke.png deleted file mode 100644 index cd6d21532cf..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_erase_stroke.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_fill.png b/release/datafiles/brushicons/gp_brush_fill.png deleted file mode 100644 index 9dac633139c..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_fill.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_grab.png b/release/datafiles/brushicons/gp_brush_grab.png deleted file mode 100644 index 2123ac69aef..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_grab.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_ink.png b/release/datafiles/brushicons/gp_brush_ink.png deleted file mode 100644 index 410a77f6117..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_ink.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_inknoise.png b/release/datafiles/brushicons/gp_brush_inknoise.png deleted file mode 100644 index 5356f697e01..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_inknoise.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_marker.png b/release/datafiles/brushicons/gp_brush_marker.png deleted file mode 100644 index 35a6f38280f..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_marker.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_pen.png b/release/datafiles/brushicons/gp_brush_pen.png deleted file mode 100644 index 9aaaa861f49..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_pen.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_pencil.png b/release/datafiles/brushicons/gp_brush_pencil.png deleted file mode 100644 index 2d1fbdfd916..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_pencil.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_pinch.png b/release/datafiles/brushicons/gp_brush_pinch.png deleted file mode 100644 index e38236d1be0..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_pinch.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_push.png b/release/datafiles/brushicons/gp_brush_push.png deleted file mode 100644 index 542764309cc..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_push.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_randomize.png b/release/datafiles/brushicons/gp_brush_randomize.png deleted file mode 100644 index 0dd1a131d86..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_randomize.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_smooth.png b/release/datafiles/brushicons/gp_brush_smooth.png deleted file mode 100644 index 7518a358219..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_smooth.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_strength.png b/release/datafiles/brushicons/gp_brush_strength.png deleted file mode 100644 index a0513119f29..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_strength.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_thickness.png b/release/datafiles/brushicons/gp_brush_thickness.png deleted file mode 100644 index 6026716f026..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_thickness.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_twist.png b/release/datafiles/brushicons/gp_brush_twist.png deleted file mode 100644 index 84b9a90e9d6..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_twist.png and /dev/null differ diff --git a/release/datafiles/brushicons/gp_brush_weight.png b/release/datafiles/brushicons/gp_brush_weight.png deleted file mode 100644 index 171e9221e92..00000000000 Binary files a/release/datafiles/brushicons/gp_brush_weight.png and /dev/null differ diff --git a/release/datafiles/brushicons/grab.png b/release/datafiles/brushicons/grab.png deleted file mode 100644 index d564fb4222b..00000000000 Binary files a/release/datafiles/brushicons/grab.png and /dev/null differ diff --git a/release/datafiles/brushicons/inflate.png b/release/datafiles/brushicons/inflate.png deleted file mode 100644 index 5faba1f8de4..00000000000 Binary files a/release/datafiles/brushicons/inflate.png and /dev/null differ diff --git a/release/datafiles/brushicons/layer.png b/release/datafiles/brushicons/layer.png deleted file mode 100644 index 0c8009b7403..00000000000 Binary files a/release/datafiles/brushicons/layer.png and /dev/null differ diff --git a/release/datafiles/brushicons/mask.png b/release/datafiles/brushicons/mask.png deleted file mode 100644 index e9e2fa66822..00000000000 Binary files a/release/datafiles/brushicons/mask.png and /dev/null differ diff --git a/release/datafiles/brushicons/mix.png b/release/datafiles/brushicons/mix.png deleted file mode 100644 index 837ac02e513..00000000000 Binary files a/release/datafiles/brushicons/mix.png and /dev/null differ diff --git a/release/datafiles/brushicons/multiply.png b/release/datafiles/brushicons/multiply.png deleted file mode 100644 index 9ee4a1eebd0..00000000000 Binary files a/release/datafiles/brushicons/multiply.png and /dev/null differ diff --git a/release/datafiles/brushicons/nudge.png b/release/datafiles/brushicons/nudge.png deleted file mode 100644 index ced9f96602b..00000000000 Binary files a/release/datafiles/brushicons/nudge.png and /dev/null differ diff --git a/release/datafiles/brushicons/paint_select.png b/release/datafiles/brushicons/paint_select.png deleted file mode 100644 index 38f9a1250b2..00000000000 Binary files a/release/datafiles/brushicons/paint_select.png and /dev/null differ diff --git a/release/datafiles/brushicons/pinch.png b/release/datafiles/brushicons/pinch.png deleted file mode 100644 index ce00ba0c040..00000000000 Binary files a/release/datafiles/brushicons/pinch.png and /dev/null differ diff --git a/release/datafiles/brushicons/scrape.png b/release/datafiles/brushicons/scrape.png deleted file mode 100644 index 7a8838ba7e9..00000000000 Binary files a/release/datafiles/brushicons/scrape.png and /dev/null differ diff --git a/release/datafiles/brushicons/smear.png b/release/datafiles/brushicons/smear.png deleted file mode 100644 index 756689d6b01..00000000000 Binary files a/release/datafiles/brushicons/smear.png and /dev/null differ diff --git a/release/datafiles/brushicons/smooth.png b/release/datafiles/brushicons/smooth.png deleted file mode 100644 index 8d248a9691b..00000000000 Binary files a/release/datafiles/brushicons/smooth.png and /dev/null differ diff --git a/release/datafiles/brushicons/snake_hook.png b/release/datafiles/brushicons/snake_hook.png deleted file mode 100644 index 961c54ec488..00000000000 Binary files a/release/datafiles/brushicons/snake_hook.png and /dev/null differ diff --git a/release/datafiles/brushicons/soften.png b/release/datafiles/brushicons/soften.png deleted file mode 100644 index 84957a12b93..00000000000 Binary files a/release/datafiles/brushicons/soften.png and /dev/null differ diff --git a/release/datafiles/brushicons/texdraw.png b/release/datafiles/brushicons/texdraw.png deleted file mode 100644 index 86d9f269fe6..00000000000 Binary files a/release/datafiles/brushicons/texdraw.png and /dev/null differ diff --git a/release/datafiles/brushicons/texfill.png b/release/datafiles/brushicons/texfill.png deleted file mode 100644 index 85a83e0ea4e..00000000000 Binary files a/release/datafiles/brushicons/texfill.png and /dev/null differ diff --git a/release/datafiles/brushicons/texmask.png b/release/datafiles/brushicons/texmask.png deleted file mode 100644 index 7ab8dde3e3b..00000000000 Binary files a/release/datafiles/brushicons/texmask.png and /dev/null differ diff --git a/release/datafiles/brushicons/thumb.png b/release/datafiles/brushicons/thumb.png deleted file mode 100644 index 821ee8eac88..00000000000 Binary files a/release/datafiles/brushicons/thumb.png and /dev/null differ diff --git a/release/datafiles/brushicons/twist.png b/release/datafiles/brushicons/twist.png deleted file mode 100644 index 84024f07937..00000000000 Binary files a/release/datafiles/brushicons/twist.png and /dev/null differ diff --git a/release/datafiles/icons/brush.gpencil_draw.draw.dat b/release/datafiles/icons/brush.gpencil_draw.draw.dat deleted file mode 100644 index 2bfbae27ba6..00000000000 Binary files a/release/datafiles/icons/brush.gpencil_draw.draw.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.gpencil_draw.erase.dat b/release/datafiles/icons/brush.gpencil_draw.erase.dat deleted file mode 100644 index d2faa6f2112..00000000000 Binary files a/release/datafiles/icons/brush.gpencil_draw.erase.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.gpencil_draw.fill.dat b/release/datafiles/icons/brush.gpencil_draw.fill.dat deleted file mode 100644 index 869e65b2fbf..00000000000 Binary files a/release/datafiles/icons/brush.gpencil_draw.fill.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.gpencil_draw.tint.dat b/release/datafiles/icons/brush.gpencil_draw.tint.dat deleted file mode 100644 index 32d8a5f04e4..00000000000 Binary files a/release/datafiles/icons/brush.gpencil_draw.tint.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.airbrush.dat b/release/datafiles/icons/brush.paint_texture.airbrush.dat deleted file mode 100644 index 28ab3224ae8..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.airbrush.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.clone.dat b/release/datafiles/icons/brush.paint_texture.clone.dat deleted file mode 100644 index 5d94ab45ada..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.clone.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.draw.dat b/release/datafiles/icons/brush.paint_texture.draw.dat deleted file mode 100644 index 678a9ea26e5..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.draw.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.fill.dat b/release/datafiles/icons/brush.paint_texture.fill.dat deleted file mode 100644 index 869e65b2fbf..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.fill.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.mask.dat b/release/datafiles/icons/brush.paint_texture.mask.dat deleted file mode 100644 index cea902261fa..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.mask.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.masklort.dat b/release/datafiles/icons/brush.paint_texture.masklort.dat deleted file mode 100644 index 4508aa9f847..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.masklort.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.multiply.dat b/release/datafiles/icons/brush.paint_texture.multiply.dat deleted file mode 100644 index 75fa09032a8..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.multiply.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.smear.dat b/release/datafiles/icons/brush.paint_texture.smear.dat deleted file mode 100644 index 694655477db..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.smear.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_texture.soften.dat b/release/datafiles/icons/brush.paint_texture.soften.dat deleted file mode 100644 index 2128de71dff..00000000000 Binary files a/release/datafiles/icons/brush.paint_texture.soften.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_vertex.alpha.dat b/release/datafiles/icons/brush.paint_vertex.alpha.dat deleted file mode 100644 index e74795dcb9e..00000000000 Binary files a/release/datafiles/icons/brush.paint_vertex.alpha.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_vertex.average.dat b/release/datafiles/icons/brush.paint_vertex.average.dat deleted file mode 100644 index f082d7ed114..00000000000 Binary files a/release/datafiles/icons/brush.paint_vertex.average.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_vertex.blur.dat b/release/datafiles/icons/brush.paint_vertex.blur.dat deleted file mode 100644 index 2128de71dff..00000000000 Binary files a/release/datafiles/icons/brush.paint_vertex.blur.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_vertex.draw.dat b/release/datafiles/icons/brush.paint_vertex.draw.dat deleted file mode 100644 index 74e00d243d6..00000000000 Binary files a/release/datafiles/icons/brush.paint_vertex.draw.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_vertex.replace.dat b/release/datafiles/icons/brush.paint_vertex.replace.dat deleted file mode 100644 index a9a9d4f047f..00000000000 Binary files a/release/datafiles/icons/brush.paint_vertex.replace.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_vertex.smear.dat b/release/datafiles/icons/brush.paint_vertex.smear.dat deleted file mode 100644 index 694655477db..00000000000 Binary files a/release/datafiles/icons/brush.paint_vertex.smear.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_weight.average.dat b/release/datafiles/icons/brush.paint_weight.average.dat deleted file mode 100644 index f082d7ed114..00000000000 Binary files a/release/datafiles/icons/brush.paint_weight.average.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_weight.blur.dat b/release/datafiles/icons/brush.paint_weight.blur.dat deleted file mode 100644 index 2128de71dff..00000000000 Binary files a/release/datafiles/icons/brush.paint_weight.blur.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_weight.draw.dat b/release/datafiles/icons/brush.paint_weight.draw.dat deleted file mode 100644 index a2641927371..00000000000 Binary files a/release/datafiles/icons/brush.paint_weight.draw.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_weight.mix.dat b/release/datafiles/icons/brush.paint_weight.mix.dat deleted file mode 100644 index 610fcd939cc..00000000000 Binary files a/release/datafiles/icons/brush.paint_weight.mix.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.paint_weight.smear.dat b/release/datafiles/icons/brush.paint_weight.smear.dat deleted file mode 100644 index 36958641266..00000000000 Binary files a/release/datafiles/icons/brush.paint_weight.smear.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.particle.add.dat b/release/datafiles/icons/brush.particle.add.dat deleted file mode 100644 index b66f4da5b71..00000000000 Binary files a/release/datafiles/icons/brush.particle.add.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.particle.comb.dat b/release/datafiles/icons/brush.particle.comb.dat deleted file mode 100644 index 1cdbcbadcdc..00000000000 Binary files a/release/datafiles/icons/brush.particle.comb.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.particle.cut.dat b/release/datafiles/icons/brush.particle.cut.dat deleted file mode 100644 index 0acc00660db..00000000000 Binary files a/release/datafiles/icons/brush.particle.cut.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.particle.length.dat b/release/datafiles/icons/brush.particle.length.dat deleted file mode 100644 index e3aa3f2f9df..00000000000 Binary files a/release/datafiles/icons/brush.particle.length.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.particle.puff.dat b/release/datafiles/icons/brush.particle.puff.dat deleted file mode 100644 index 72b4851cc89..00000000000 Binary files a/release/datafiles/icons/brush.particle.puff.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.particle.smooth.dat b/release/datafiles/icons/brush.particle.smooth.dat deleted file mode 100644 index ba4bd081f33..00000000000 Binary files a/release/datafiles/icons/brush.particle.smooth.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.particle.weight.dat b/release/datafiles/icons/brush.particle.weight.dat deleted file mode 100644 index 92e5cec9a94..00000000000 Binary files a/release/datafiles/icons/brush.particle.weight.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.blob.dat b/release/datafiles/icons/brush.sculpt.blob.dat deleted file mode 100644 index 890a73e26a6..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.blob.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.boundary.dat b/release/datafiles/icons/brush.sculpt.boundary.dat deleted file mode 100644 index 1b71d24d771..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.boundary.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.clay.dat b/release/datafiles/icons/brush.sculpt.clay.dat deleted file mode 100644 index 8e333846499..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.clay.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.clay_strips.dat b/release/datafiles/icons/brush.sculpt.clay_strips.dat deleted file mode 100644 index 8d1382d80b2..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.clay_strips.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.clay_thumb.dat b/release/datafiles/icons/brush.sculpt.clay_thumb.dat deleted file mode 100644 index b063fff9967..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.clay_thumb.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.cloth.dat b/release/datafiles/icons/brush.sculpt.cloth.dat deleted file mode 100644 index 15ad0c7dc94..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.cloth.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.crease.dat b/release/datafiles/icons/brush.sculpt.crease.dat deleted file mode 100644 index 686d04ce1a7..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.crease.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.displacement_eraser.dat b/release/datafiles/icons/brush.sculpt.displacement_eraser.dat deleted file mode 100644 index 5c479fd59cb..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.displacement_eraser.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.displacement_smear.dat b/release/datafiles/icons/brush.sculpt.displacement_smear.dat deleted file mode 100644 index ed84702cbd3..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.displacement_smear.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.draw.dat b/release/datafiles/icons/brush.sculpt.draw.dat deleted file mode 100644 index 014ce10e8cc..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.draw.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.draw_face_sets.dat b/release/datafiles/icons/brush.sculpt.draw_face_sets.dat deleted file mode 100644 index ade40de029d..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.draw_face_sets.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.draw_sharp.dat b/release/datafiles/icons/brush.sculpt.draw_sharp.dat deleted file mode 100644 index cf606324b07..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.draw_sharp.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.elastic_deform.dat b/release/datafiles/icons/brush.sculpt.elastic_deform.dat deleted file mode 100644 index db57ef2fac5..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.elastic_deform.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.fill.dat b/release/datafiles/icons/brush.sculpt.fill.dat deleted file mode 100644 index 08fe0711d33..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.fill.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.flatten.dat b/release/datafiles/icons/brush.sculpt.flatten.dat deleted file mode 100644 index a4439d75eed..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.flatten.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.grab.dat b/release/datafiles/icons/brush.sculpt.grab.dat deleted file mode 100644 index 819c9263b45..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.grab.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.inflate.dat b/release/datafiles/icons/brush.sculpt.inflate.dat deleted file mode 100644 index 7e85ee23fcf..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.inflate.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.layer.dat b/release/datafiles/icons/brush.sculpt.layer.dat deleted file mode 100644 index 337362185e0..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.layer.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.mask.dat b/release/datafiles/icons/brush.sculpt.mask.dat deleted file mode 100644 index a285c4c2e8f..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.mask.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat b/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat deleted file mode 100644 index ea64b2d9e45..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.multiplane_scrape.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.nudge.dat b/release/datafiles/icons/brush.sculpt.nudge.dat deleted file mode 100644 index f5a93ede065..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.nudge.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.paint.dat b/release/datafiles/icons/brush.sculpt.paint.dat deleted file mode 100644 index e499d33e867..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.paint.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.pinch.dat b/release/datafiles/icons/brush.sculpt.pinch.dat deleted file mode 100644 index 7dbbdef3bcc..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.pinch.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.pose.dat b/release/datafiles/icons/brush.sculpt.pose.dat deleted file mode 100644 index 6bd7764bf23..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.pose.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.rotate.dat b/release/datafiles/icons/brush.sculpt.rotate.dat deleted file mode 100644 index b7b8f083bde..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.rotate.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.scrape.dat b/release/datafiles/icons/brush.sculpt.scrape.dat deleted file mode 100644 index afb5a46a3bd..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.scrape.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.simplify.dat b/release/datafiles/icons/brush.sculpt.simplify.dat deleted file mode 100644 index f7de2f97aa1..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.simplify.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.smear.dat b/release/datafiles/icons/brush.sculpt.smear.dat deleted file mode 100644 index a9867cef5a4..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.smear.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.smooth.dat b/release/datafiles/icons/brush.sculpt.smooth.dat deleted file mode 100644 index c42049cb51a..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.smooth.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.snake_hook.dat b/release/datafiles/icons/brush.sculpt.snake_hook.dat deleted file mode 100644 index ce47b7141cf..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.snake_hook.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.thumb.dat b/release/datafiles/icons/brush.sculpt.thumb.dat deleted file mode 100644 index f54a141eca7..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.thumb.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.sculpt.topology.dat b/release/datafiles/icons/brush.sculpt.topology.dat deleted file mode 100644 index ec3699a7c2d..00000000000 Binary files a/release/datafiles/icons/brush.sculpt.topology.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.uv_sculpt.grab.dat b/release/datafiles/icons/brush.uv_sculpt.grab.dat deleted file mode 100644 index 8f265b1af21..00000000000 Binary files a/release/datafiles/icons/brush.uv_sculpt.grab.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.uv_sculpt.pinch.dat b/release/datafiles/icons/brush.uv_sculpt.pinch.dat deleted file mode 100644 index 06af3ddb801..00000000000 Binary files a/release/datafiles/icons/brush.uv_sculpt.pinch.dat and /dev/null differ diff --git a/release/datafiles/icons/brush.uv_sculpt.relax.dat b/release/datafiles/icons/brush.uv_sculpt.relax.dat deleted file mode 100644 index 1df2828c669..00000000000 Binary files a/release/datafiles/icons/brush.uv_sculpt.relax.dat and /dev/null differ diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 52f74d04cce..1ca8c3be6da 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -24,72 +24,6 @@ set(LIB # See: `make icons_geom` and the script `./release/datafiles/blender_icons_geom_update.py`. set_property(GLOBAL PROPERTY ICON_GEOM_NAMES # BEGIN ICON_GEOM_NAMES - 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.boundary - brush.sculpt.clay - brush.sculpt.clay_strips - brush.sculpt.clay_thumb - brush.sculpt.cloth - brush.sculpt.crease - brush.sculpt.displacement_eraser - brush.sculpt.displacement_smear - 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.paint - brush.sculpt.pinch - brush.sculpt.pose - brush.sculpt.rotate - brush.sculpt.scrape - brush.sculpt.simplify - brush.sculpt.smear - 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 diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index 211554dcccd..77a37eaa1a5 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -883,73 +883,6 @@ DEF_ICON_BLANK(856) DEF_ICON_BLANK(857) DEF_ICON_BLANK(872) -/* brush icons */ - -DEF_ICON_COLOR(BRUSH_BLOB) -DEF_ICON_COLOR(BRUSH_BLUR) -DEF_ICON_COLOR(BRUSH_CLAY) -DEF_ICON_COLOR(BRUSH_CLAY_STRIPS) -DEF_ICON_COLOR(BRUSH_CLONE) -DEF_ICON_COLOR(BRUSH_CREASE) -DEF_ICON_COLOR(BRUSH_FILL) -DEF_ICON_COLOR(BRUSH_FLATTEN) -DEF_ICON_COLOR(BRUSH_GRAB) -DEF_ICON_COLOR(BRUSH_INFLATE) -DEF_ICON_COLOR(BRUSH_LAYER) -DEF_ICON_COLOR(BRUSH_MASK) -DEF_ICON_COLOR(BRUSH_MIX) -DEF_ICON_COLOR(BRUSH_NUDGE) -DEF_ICON_COLOR(BRUSH_PAINT_SELECT) -DEF_ICON_COLOR(BRUSH_PINCH) -DEF_ICON_COLOR(BRUSH_SCRAPE) -DEF_ICON_COLOR(BRUSH_SCULPT_DRAW) -DEF_ICON_COLOR(BRUSH_SMEAR) -DEF_ICON_COLOR(BRUSH_SMOOTH) -DEF_ICON_COLOR(BRUSH_SNAKE_HOOK) -DEF_ICON_COLOR(BRUSH_SOFTEN) -DEF_ICON_COLOR(BRUSH_TEXDRAW) -DEF_ICON_COLOR(BRUSH_TEXFILL) -DEF_ICON_COLOR(BRUSH_TEXMASK) -DEF_ICON_COLOR(BRUSH_THUMB) -DEF_ICON_COLOR(BRUSH_ROTATE) - -/* grease pencil sculpt */ -DEF_ICON_COLOR(GPBRUSH_SMOOTH) -DEF_ICON_COLOR(GPBRUSH_THICKNESS) -DEF_ICON_COLOR(GPBRUSH_STRENGTH) -DEF_ICON_COLOR(GPBRUSH_GRAB) -DEF_ICON_COLOR(GPBRUSH_PUSH) -DEF_ICON_COLOR(GPBRUSH_TWIST) -DEF_ICON_COLOR(GPBRUSH_PINCH) -DEF_ICON_COLOR(GPBRUSH_RANDOMIZE) -DEF_ICON_COLOR(GPBRUSH_CLONE) -DEF_ICON_COLOR(GPBRUSH_WEIGHT) -DEF_ICON_COLOR(GPBRUSH_PENCIL) -DEF_ICON_COLOR(GPBRUSH_PEN) -DEF_ICON_COLOR(GPBRUSH_INK) -DEF_ICON_COLOR(GPBRUSH_INKNOISE) -DEF_ICON_COLOR(GPBRUSH_BLOCK) -DEF_ICON_COLOR(GPBRUSH_MARKER) -DEF_ICON_COLOR(GPBRUSH_FILL) -DEF_ICON_COLOR(GPBRUSH_AIRBRUSH) -DEF_ICON_COLOR(GPBRUSH_CHISEL) -DEF_ICON_COLOR(GPBRUSH_ERASE_SOFT) -DEF_ICON_COLOR(GPBRUSH_ERASE_HARD) -DEF_ICON_COLOR(GPBRUSH_ERASE_STROKE) - -/* Curves sculpt. */ -DEF_ICON_COLOR(BRUSH_CURVES_ADD) -DEF_ICON_COLOR(BRUSH_CURVES_COMB) -DEF_ICON_COLOR(BRUSH_CURVES_CUT) -DEF_ICON_COLOR(BRUSH_CURVES_DELETE) -DEF_ICON_COLOR(BRUSH_CURVES_DENSITY) -DEF_ICON_COLOR(BRUSH_CURVES_GROW_SHRINK) -DEF_ICON_COLOR(BRUSH_CURVES_PINCH) -DEF_ICON_COLOR(BRUSH_CURVES_PUFF) -DEF_ICON_COLOR(BRUSH_CURVES_SLIDE) -DEF_ICON_COLOR(BRUSH_CURVES_SMOOTH) -DEF_ICON_COLOR(BRUSH_CURVES_SNAKE_HOOK) - /* Vector icons. */ DEF_ICON_VECTOR(KEYTYPE_KEYFRAME_VEC) DEF_ICON_VECTOR(KEYTYPE_BREAKDOWN_VEC) diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc index f4928f1706e..348e837b620 100644 --- a/source/blender/makesrna/intern/rna_brush.cc +++ b/source/blender/makesrna/intern/rna_brush.cc @@ -149,79 +149,71 @@ const EnumPropertyItem rna_enum_brush_automasking_flag_items[] = { {0, nullptr, 0, nullptr, nullptr}}; const EnumPropertyItem rna_enum_brush_sculpt_tool_items[] = { - {SCULPT_TOOL_DRAW, "DRAW", ICON_BRUSH_SCULPT_DRAW, "Draw", ""}, - {SCULPT_TOOL_DRAW_SHARP, "DRAW_SHARP", ICON_BRUSH_SCULPT_DRAW, "Draw Sharp", ""}, - {SCULPT_TOOL_CLAY, "CLAY", ICON_BRUSH_CLAY, "Clay", ""}, - {SCULPT_TOOL_CLAY_STRIPS, "CLAY_STRIPS", ICON_BRUSH_CLAY_STRIPS, "Clay Strips", ""}, - {SCULPT_TOOL_CLAY_THUMB, "CLAY_THUMB", ICON_BRUSH_CLAY_STRIPS, "Clay Thumb", ""}, - {SCULPT_TOOL_LAYER, "LAYER", ICON_BRUSH_LAYER, "Layer", ""}, - {SCULPT_TOOL_INFLATE, "INFLATE", ICON_BRUSH_INFLATE, "Inflate", ""}, - {SCULPT_TOOL_BLOB, "BLOB", ICON_BRUSH_BLOB, "Blob", ""}, - {SCULPT_TOOL_CREASE, "CREASE", ICON_BRUSH_CREASE, "Crease", ""}, + {SCULPT_TOOL_DRAW, "DRAW", 0, "Draw", ""}, + {SCULPT_TOOL_DRAW_SHARP, "DRAW_SHARP", 0, "Draw Sharp", ""}, + {SCULPT_TOOL_CLAY, "CLAY", 0, "Clay", ""}, + {SCULPT_TOOL_CLAY_STRIPS, "CLAY_STRIPS", 0, "Clay Strips", ""}, + {SCULPT_TOOL_CLAY_THUMB, "CLAY_THUMB", 0, "Clay Thumb", ""}, + {SCULPT_TOOL_LAYER, "LAYER", 0, "Layer", ""}, + {SCULPT_TOOL_INFLATE, "INFLATE", 0, "Inflate", ""}, + {SCULPT_TOOL_BLOB, "BLOB", 0, "Blob", ""}, + {SCULPT_TOOL_CREASE, "CREASE", 0, "Crease", ""}, RNA_ENUM_ITEM_SEPR, - {SCULPT_TOOL_SMOOTH, "SMOOTH", ICON_BRUSH_SMOOTH, "Smooth", ""}, - {SCULPT_TOOL_FLATTEN, "FLATTEN", ICON_BRUSH_FLATTEN, "Flatten", ""}, - {SCULPT_TOOL_FILL, "FILL", ICON_BRUSH_FILL, "Fill", ""}, - {SCULPT_TOOL_SCRAPE, "SCRAPE", ICON_BRUSH_SCRAPE, "Scrape", ""}, - {SCULPT_TOOL_MULTIPLANE_SCRAPE, - "MULTIPLANE_SCRAPE", - ICON_BRUSH_SCRAPE, - "Multi-plane Scrape", - ""}, - {SCULPT_TOOL_PINCH, "PINCH", ICON_BRUSH_PINCH, "Pinch", ""}, + {SCULPT_TOOL_SMOOTH, "SMOOTH", 0, "Smooth", ""}, + {SCULPT_TOOL_FLATTEN, "FLATTEN", 0, "Flatten", ""}, + {SCULPT_TOOL_FILL, "FILL", 0, "Fill", ""}, + {SCULPT_TOOL_SCRAPE, "SCRAPE", 0, "Scrape", ""}, + {SCULPT_TOOL_MULTIPLANE_SCRAPE, "MULTIPLANE_SCRAPE", 0, "Multi-plane Scrape", ""}, + {SCULPT_TOOL_PINCH, "PINCH", 0, "Pinch", ""}, RNA_ENUM_ITEM_SEPR, - {SCULPT_TOOL_GRAB, "GRAB", ICON_BRUSH_GRAB, "Grab", ""}, - {SCULPT_TOOL_ELASTIC_DEFORM, "ELASTIC_DEFORM", ICON_BRUSH_GRAB, "Elastic Deform", ""}, - {SCULPT_TOOL_SNAKE_HOOK, "SNAKE_HOOK", ICON_BRUSH_SNAKE_HOOK, "Snake Hook", ""}, - {SCULPT_TOOL_THUMB, "THUMB", ICON_BRUSH_THUMB, "Thumb", ""}, - {SCULPT_TOOL_POSE, "POSE", ICON_BRUSH_GRAB, "Pose", ""}, - {SCULPT_TOOL_NUDGE, "NUDGE", ICON_BRUSH_NUDGE, "Nudge", ""}, - {SCULPT_TOOL_ROTATE, "ROTATE", ICON_BRUSH_ROTATE, "Rotate", ""}, - {SCULPT_TOOL_SLIDE_RELAX, "TOPOLOGY", ICON_BRUSH_GRAB, "Slide Relax", ""}, - {SCULPT_TOOL_BOUNDARY, "BOUNDARY", ICON_BRUSH_GRAB, "Boundary", ""}, + {SCULPT_TOOL_GRAB, "GRAB", 0, "Grab", ""}, + {SCULPT_TOOL_ELASTIC_DEFORM, "ELASTIC_DEFORM", 0, "Elastic Deform", ""}, + {SCULPT_TOOL_SNAKE_HOOK, "SNAKE_HOOK", 0, "Snake Hook", ""}, + {SCULPT_TOOL_THUMB, "THUMB", 0, "Thumb", ""}, + {SCULPT_TOOL_POSE, "POSE", 0, "Pose", ""}, + {SCULPT_TOOL_NUDGE, "NUDGE", 0, "Nudge", ""}, + {SCULPT_TOOL_ROTATE, "ROTATE", 0, "Rotate", ""}, + {SCULPT_TOOL_SLIDE_RELAX, "TOPOLOGY", 0, "Slide Relax", ""}, + {SCULPT_TOOL_BOUNDARY, "BOUNDARY", 0, "Boundary", ""}, RNA_ENUM_ITEM_SEPR, - {SCULPT_TOOL_CLOTH, "CLOTH", ICON_BRUSH_SCULPT_DRAW, "Cloth", ""}, - {SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", ICON_BRUSH_DATA, "Simplify", ""}, - {SCULPT_TOOL_MASK, "MASK", ICON_BRUSH_MASK, "Mask", ""}, - {SCULPT_TOOL_DRAW_FACE_SETS, "DRAW_FACE_SETS", ICON_BRUSH_MASK, "Draw Face Sets", ""}, + {SCULPT_TOOL_CLOTH, "CLOTH", 0, "Cloth", ""}, + {SCULPT_TOOL_SIMPLIFY, "SIMPLIFY", 0, "Simplify", ""}, + {SCULPT_TOOL_MASK, "MASK", 0, "Mask", ""}, + {SCULPT_TOOL_DRAW_FACE_SETS, "DRAW_FACE_SETS", 0, "Draw Face Sets", ""}, {SCULPT_TOOL_DISPLACEMENT_ERASER, "DISPLACEMENT_ERASER", - ICON_BRUSH_SCULPT_DRAW, + 0, "Multires Displacement Eraser", ""}, - {SCULPT_TOOL_DISPLACEMENT_SMEAR, - "DISPLACEMENT_SMEAR", - ICON_BRUSH_SCULPT_DRAW, - "Multires Displacement Smear", - ""}, - {SCULPT_TOOL_PAINT, "PAINT", ICON_BRUSH_SCULPT_DRAW, "Paint", ""}, - {SCULPT_TOOL_SMEAR, "SMEAR", ICON_BRUSH_SCULPT_DRAW, "Smear", ""}, + {SCULPT_TOOL_DISPLACEMENT_SMEAR, "DISPLACEMENT_SMEAR", 0, "Multires Displacement Smear", ""}, + {SCULPT_TOOL_PAINT, "PAINT", 0, "Paint", ""}, + {SCULPT_TOOL_SMEAR, "SMEAR", 0, "Smear", ""}, {0, nullptr, 0, nullptr, nullptr}, }; const EnumPropertyItem rna_enum_brush_vertex_tool_items[] = { - {VPAINT_TOOL_DRAW, "DRAW", ICON_BRUSH_MIX, "Draw", ""}, - {VPAINT_TOOL_BLUR, "BLUR", ICON_BRUSH_BLUR, "Blur", ""}, - {VPAINT_TOOL_AVERAGE, "AVERAGE", ICON_BRUSH_BLUR, "Average", ""}, - {VPAINT_TOOL_SMEAR, "SMEAR", ICON_BRUSH_BLUR, "Smear", ""}, + {VPAINT_TOOL_DRAW, "DRAW", 0, "Draw", ""}, + {VPAINT_TOOL_BLUR, "BLUR", 0, "Blur", ""}, + {VPAINT_TOOL_AVERAGE, "AVERAGE", 0, "Average", ""}, + {VPAINT_TOOL_SMEAR, "SMEAR", 0, "Smear", ""}, {0, nullptr, 0, nullptr, nullptr}, }; const EnumPropertyItem rna_enum_brush_weight_tool_items[] = { - {WPAINT_TOOL_DRAW, "DRAW", ICON_BRUSH_MIX, "Draw", ""}, - {WPAINT_TOOL_BLUR, "BLUR", ICON_BRUSH_BLUR, "Blur", ""}, - {WPAINT_TOOL_AVERAGE, "AVERAGE", ICON_BRUSH_BLUR, "Average", ""}, - {WPAINT_TOOL_SMEAR, "SMEAR", ICON_BRUSH_BLUR, "Smear", ""}, + {WPAINT_TOOL_DRAW, "DRAW", 0, "Draw", ""}, + {WPAINT_TOOL_BLUR, "BLUR", 0, "Blur", ""}, + {WPAINT_TOOL_AVERAGE, "AVERAGE", 0, "Average", ""}, + {WPAINT_TOOL_SMEAR, "SMEAR", 0, "Smear", ""}, {0, nullptr, 0, nullptr, nullptr}, }; const EnumPropertyItem rna_enum_brush_image_tool_items[] = { - {PAINT_TOOL_DRAW, "DRAW", ICON_BRUSH_TEXDRAW, "Draw", ""}, - {PAINT_TOOL_SOFTEN, "SOFTEN", ICON_BRUSH_SOFTEN, "Soften", ""}, - {PAINT_TOOL_SMEAR, "SMEAR", ICON_BRUSH_SMEAR, "Smear", ""}, - {PAINT_TOOL_CLONE, "CLONE", ICON_BRUSH_CLONE, "Clone", ""}, - {PAINT_TOOL_FILL, "FILL", ICON_BRUSH_TEXFILL, "Fill", ""}, - {PAINT_TOOL_MASK, "MASK", ICON_BRUSH_TEXMASK, "Mask", ""}, + {PAINT_TOOL_DRAW, "DRAW", 0, "Draw", ""}, + {PAINT_TOOL_SOFTEN, "SOFTEN", 0, "Soften", ""}, + {PAINT_TOOL_SMEAR, "SMEAR", 0, "Smear", ""}, + {PAINT_TOOL_CLONE, "CLONE", 0, "Clone", ""}, + {PAINT_TOOL_FILL, "FILL", 0, "Fill", ""}, + {PAINT_TOOL_MASK, "MASK", 0, "Mask", ""}, {0, nullptr, 0, nullptr, nullptr}, }; @@ -237,100 +229,56 @@ const EnumPropertyItem rna_enum_brush_gpencil_types_items[] = { ICON_PANEL_CLOSE, "Erase", "The brush is used for erasing strokes"}, - {GPAINT_TOOL_TINT, - "TINT", - ICON_BRUSH_TEXDRAW, - "Tint", - "The brush is of type used for tinting strokes"}, + {GPAINT_TOOL_TINT, "TINT", 0, "Tint", "The brush is of type used for tinting strokes"}, {0, nullptr, 0, nullptr, nullptr}, }; const EnumPropertyItem rna_enum_brush_gpencil_vertex_types_items[] = { - {GPVERTEX_TOOL_DRAW, "DRAW", ICON_BRUSH_MIX, "Draw", "Paint a color on stroke points"}, - {GPVERTEX_TOOL_BLUR, - "BLUR", - ICON_BRUSH_BLUR, - "Blur", - "Smooth out the colors of adjacent stroke points"}, + {GPVERTEX_TOOL_DRAW, "DRAW", 0, "Draw", "Paint a color on stroke points"}, + {GPVERTEX_TOOL_BLUR, "BLUR", 0, "Blur", "Smooth out the colors of adjacent stroke points"}, {GPVERTEX_TOOL_AVERAGE, "AVERAGE", - ICON_BRUSH_BLUR, + 0, "Average", "Smooth out colors with the average color under the brush"}, - {GPVERTEX_TOOL_SMEAR, - "SMEAR", - ICON_BRUSH_BLUR, - "Smear", - "Smudge colors by grabbing and dragging them"}, + {GPVERTEX_TOOL_SMEAR, "SMEAR", 0, "Smear", "Smudge colors by grabbing and dragging them"}, {GPVERTEX_TOOL_REPLACE, "REPLACE", - ICON_BRUSH_BLUR, + 0, "Replace", "Replace the color of stroke points that already have a color applied"}, {0, nullptr, 0, nullptr, nullptr}, }; const EnumPropertyItem rna_enum_brush_gpencil_sculpt_types_items[] = { - {GPSCULPT_TOOL_SMOOTH, "SMOOTH", ICON_GPBRUSH_SMOOTH, "Smooth", "Smooth stroke points"}, - {GPSCULPT_TOOL_THICKNESS, - "THICKNESS", - ICON_GPBRUSH_THICKNESS, - "Thickness", - "Adjust thickness of strokes"}, - {GPSCULPT_TOOL_STRENGTH, - "STRENGTH", - ICON_GPBRUSH_STRENGTH, - "Strength", - "Adjust color strength of strokes"}, + {GPSCULPT_TOOL_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth stroke points"}, + {GPSCULPT_TOOL_THICKNESS, "THICKNESS", 0, "Thickness", "Adjust thickness of strokes"}, + {GPSCULPT_TOOL_STRENGTH, "STRENGTH", 0, "Strength", "Adjust color strength of strokes"}, {GPSCULPT_TOOL_RANDOMIZE, "RANDOMIZE", - ICON_GPBRUSH_RANDOMIZE, + 0, "Randomize", "Introduce jitter/randomness into strokes"}, {GPSCULPT_TOOL_GRAB, "GRAB", - ICON_GPBRUSH_GRAB, + 0, "Grab", "Translate the set of points initially within the brush circle"}, - {GPSCULPT_TOOL_PUSH, - "PUSH", - ICON_GPBRUSH_PUSH, - "Push", - "Move points out of the way, as if combing them"}, - {GPSCULPT_TOOL_TWIST, - "TWIST", - ICON_GPBRUSH_TWIST, - "Twist", - "Rotate points around the midpoint of the brush"}, - {GPSCULPT_TOOL_PINCH, - "PINCH", - ICON_GPBRUSH_PINCH, - "Pinch", - "Pull points towards the midpoint of the brush"}, + {GPSCULPT_TOOL_PUSH, "PUSH", 0, "Push", "Move points out of the way, as if combing them"}, + {GPSCULPT_TOOL_TWIST, "TWIST", 0, "Twist", "Rotate points around the midpoint of the brush"}, + {GPSCULPT_TOOL_PINCH, "PINCH", 0, "Pinch", "Pull points towards the midpoint of the brush"}, {GPSCULPT_TOOL_CLONE, "CLONE", - ICON_GPBRUSH_CLONE, + 0, "Clone", "Paste copies of the strokes stored on the internal clipboard"}, {0, nullptr, 0, nullptr, nullptr}}; const EnumPropertyItem rna_enum_brush_gpencil_weight_types_items[] = { - {GPWEIGHT_TOOL_DRAW, - "WEIGHT", - ICON_GPBRUSH_WEIGHT, - "Weight", - "Paint weight in active vertex group"}, - {GPWEIGHT_TOOL_BLUR, "BLUR", ICON_BRUSH_BLUR, "Blur", "Blur weight in active vertex group"}, - {GPWEIGHT_TOOL_AVERAGE, - "AVERAGE", - ICON_BRUSH_BLUR, - "Average", - "Average weight in active vertex group"}, - {GPWEIGHT_TOOL_SMEAR, - "SMEAR", - ICON_BRUSH_SMEAR, - "Smear", - "Smear weight in active vertex group"}, + {GPWEIGHT_TOOL_DRAW, "WEIGHT", 0, "Weight", "Paint weight in active vertex group"}, + {GPWEIGHT_TOOL_BLUR, "BLUR", 0, "Blur", "Blur weight in active vertex group"}, + {GPWEIGHT_TOOL_AVERAGE, "AVERAGE", 0, "Average", "Average weight in active vertex group"}, + {GPWEIGHT_TOOL_SMEAR, "SMEAR", 0, "Smear", "Smear weight in active vertex group"}, {0, nullptr, 0, nullptr, nullptr}, };