archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert "Grease-Pencil: Icons"

Browse Source 
This reverts commits:

* f0ef360386 Grease-Pencil: Icons from the grease pencil branch
* 13bf4b3804 Grease-Pencil: Fixup for icons
* fb8c382fa1 Grease Pencil dat files fix
This commit is contained in:
Dalai Felinto
2018-01-23 10:41:25 -02:00
parent 41cc2ae626
commit 173f90c700
10 changed files with 1979 additions and 2332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4303
release/datafiles/blender_icons.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

BIN
release/datafiles/blender_icons16/icon16_gpencil_stroke_paint.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_object_origin.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_outliner_data_gpencil.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_outliner_ob_gpencil.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_gpencil_stroke_paint.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_object_origin.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_outliner_data_gpencil.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_outliner_ob_gpencil.dat
View File

Binary file not shown.

8
source/blender/editors/include/UI_icons.h
View File

@@ -190,8 +190,8 @@ DEF_ICON(SCULPTMODE_HLT)
DEF_ICON(POSE_HLT)
DEF_ICON(PARTICLEMODE)
DEF_ICON(LIGHTPAINT)
DEF_ICON(GPENCIL_STROKE_PAINT)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK063)
DEF_ICON(BLANK064)
DEF_ICON(BLANK065)
DEF_ICON(BLANK066)
@@ -313,8 +313,8 @@ DEF_ICON(OUTLINER_OB_SURFACE)
DEF_ICON(OUTLINER_OB_SPEAKER)
DEF_ICON(OUTLINER_OB_FORCE_FIELD)
DEF_ICON(OUTLINER_OB_GROUP_INSTANCE)
DEF_ICON(OUTLINER_OB_GPENCIL)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK122)
DEF_ICON(BLANK123)
DEF_ICON(BLANK124)
DEF_ICON(BLANK125)
@@ -344,8 +344,8 @@ DEF_ICON(OUTLINER_DATA_FONT)
DEF_ICON(OUTLINER_DATA_SURFACE)
DEF_ICON(OUTLINER_DATA_SPEAKER)
DEF_ICON(OUTLINER_DATA_POSE)
DEF_ICON(OUTLINER_DATA_GPENCIL)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK130)
DEF_ICON(BLANK131)
DEF_ICON(BLANK132)
DEF_ICON(BLANK133)
@@ -713,8 +713,8 @@ DEF_ICON(CLIPUV_DEHLT)
DEF_ICON(CLIPUV_HLT)
DEF_ICON(SNAP_PEEL_OBJECT)
DEF_ICON(GRID)
DEF_ICON(OBJECT_ORIGIN)
#ifndef DEF_ICON_BLANK_SKIP
DEF_ICON(BLANK221)
DEF_ICON(BLANK222)
DEF_ICON(BLANK224)
DEF_ICON(BLANK225)