[Bf-blender-cvs] [4eefe33f774] greasepencil-object: Icons for Grease Pencil/Annotation tools
Joshua Leung
noreply at git.blender.org
Thu Jul 5 17:44:38 CEST 2018
Commit: 4eefe33f774928eea4e1e778e8361a10c248c2bb
Author: Joshua Leung
Date: Fri Jul 6 03:37:00 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rB4eefe33f774928eea4e1e778e8361a10c248c2bb
Icons for Grease Pencil/Annotation tools
These were in the icon_geom.blend file in SVN (lib/resources),
but needed to be manually added to the Export group for this to
work.
They are needed for use for use with the annotation tools.
NOTE: There are currently problems running the icon generation
scripts in the gp-object branch due to some file loading pointer
remapping problems there causing segfaults when running the script.
Thus, I generated these icons using the 2.8 branch, then cherry-picked
that commit over to this branch.
===================================================================
A release/datafiles/icons/ops.gpencil.draw.dat
A release/datafiles/icons/ops.gpencil.draw.eraser.dat
A release/datafiles/icons/ops.gpencil.draw.line.dat
A release/datafiles/icons/ops.gpencil.draw.poly.dat
M source/blender/editors/datafiles/CMakeLists.txt
===================================================================
diff --git a/release/datafiles/icons/ops.gpencil.draw.dat b/release/datafiles/icons/ops.gpencil.draw.dat
new file mode 100644
index 00000000000..3adc50ab17d
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.draw.eraser.dat b/release/datafiles/icons/ops.gpencil.draw.eraser.dat
new file mode 100644
index 00000000000..323d8c23245
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.eraser.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.draw.line.dat b/release/datafiles/icons/ops.gpencil.draw.line.dat
new file mode 100644
index 00000000000..238db63807a
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.line.dat differ
diff --git a/release/datafiles/icons/ops.gpencil.draw.poly.dat b/release/datafiles/icons/ops.gpencil.draw.poly.dat
new file mode 100644
index 00000000000..8351e48fec1
Binary files /dev/null and b/release/datafiles/icons/ops.gpencil.draw.poly.dat differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index d02b6d8d413..1946ab24aa4 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -579,6 +579,10 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES
ops.generic.select_border
ops.generic.select_circle
ops.generic.select_lasso
+ ops.gpencil.draw
+ ops.gpencil.draw.eraser
+ ops.gpencil.draw.line
+ ops.gpencil.draw.poly
ops.mesh.bevel
ops.mesh.bisect
ops.mesh.dupli_extrude_cursor
More information about the Bf-blender-cvs
mailing list