Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / include / UI_icons.h
index 0c5631a..3bc1255 100644 (file)
@@ -190,8 +190,8 @@ DEF_ICON(SCULPTMODE_HLT)
 DEF_ICON(POSE_HLT)
 DEF_ICON(PARTICLEMODE)
 DEF_ICON(LIGHTPAINT)
+DEF_ICON(GREASEPENCIL_STROKE_PAINT)
 #ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK063)
        DEF_ICON(BLANK064)
        DEF_ICON(BLANK065)
        DEF_ICON(BLANK066)
@@ -257,9 +257,7 @@ DEF_ICON(STRANDS)
 DEF_ICON(LIBRARY_DATA_INDIRECT)
 DEF_ICON(GREASEPENCIL)
 DEF_ICON(LINE_DATA)
-#ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK084)
-#endif
+DEF_ICON(LIBRARY_DATA_OVERRIDE)
 DEF_ICON(GROUP_BONE)
 DEF_ICON(GROUP_VERTEX)
 DEF_ICON(GROUP_VCOL)
@@ -315,9 +313,9 @@ 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_GREASEPENCIL)
+DEF_ICON(OUTLINER_OB_LIGHTPROBE)
 #ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK122)
-       DEF_ICON(BLANK123)
        DEF_ICON(BLANK124)
        DEF_ICON(BLANK125)
 #endif
@@ -346,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_GREASEPENCIL)
 #ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK130)
        DEF_ICON(BLANK131)
        DEF_ICON(BLANK132)
        DEF_ICON(BLANK133)
@@ -414,10 +412,10 @@ DEF_ICON(CURVE_BEZCIRCLE)
 DEF_ICON(CURVE_NCURVE)
 DEF_ICON(CURVE_NCIRCLE)
 DEF_ICON(CURVE_PATH)
+DEF_ICON(LIGHTPROBE_CUBEMAP)
+DEF_ICON(LIGHTPROBE_PLANAR)
+DEF_ICON(LIGHTPROBE_GRID)
 #ifndef DEF_ICON_BLANK_SKIP
-       DEF_ICON(BLANK644)
-       DEF_ICON(BLANK645)
-       DEF_ICON(BLANK646)
        DEF_ICON(BLANK647)
        DEF_ICON(BLANK648)
 #endif
@@ -715,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)
@@ -1033,4 +1031,3 @@ DEF_VICO(COLORSET_17_VEC)
 DEF_VICO(COLORSET_18_VEC)
 DEF_VICO(COLORSET_19_VEC)
 DEF_VICO(COLORSET_20_VEC)
-