Undo revision 23130 which was a merge with 2.5, a messy one because I did something...
[blender.git] / source / blender / editors / include / UI_icons.h
index f16fc9e..010101a 100644 (file)
@@ -101,7 +101,7 @@ DEF_ICON(ICON_RENDER_REGION)
 DEF_ICON(ICON_BORDER_RECT)
 DEF_ICON(ICON_BORDER_LASSO)
 DEF_ICON(ICON_FREEZE)
-DEF_ICON(ICON_STYLUS_PRESSURE)
+DEF_ICON(ICON_BLANK031)
 DEF_ICON(ICON_BLANK032)
 DEF_ICON(ICON_BLANK033)
 DEF_ICON(ICON_BLANK034)
@@ -241,7 +241,7 @@ DEF_ICON(ICON_BLANK080F)
 DEF_ICON(ICON_BOIDS)
 DEF_ICON(ICON_STRANDS)
 DEF_ICON(ICON_LIBRARY_DATA_INDIRECT)
-DEF_ICON(ICON_GREASEPENCIL)
+DEF_ICON(ICON_BLANK082)
 DEF_ICON(ICON_BLANK083)
 DEF_ICON(ICON_BLANK084)
 DEF_ICON(ICON_GROUP_BONE)
@@ -538,7 +538,7 @@ DEF_ICON(ICON_MOD_CLOTH)
 DEF_ICON(ICON_MOD_EXPLODE)
 DEF_ICON(ICON_MOD_FLUIDSIM)
 DEF_ICON(ICON_MOD_MULTIRES)
-DEF_ICON(ICON_MOD_SMOKE)
+DEF_ICON(ICON_BLANK157)
 DEF_ICON(ICON_BLANK158)
 DEF_ICON(ICON_BLANK159)
 DEF_ICON(ICON_BLANK160)
@@ -686,10 +686,10 @@ DEF_ICON(ICON_BLANK231)
 DEF_ICON(ICON_BLANK232)
 DEF_ICON(ICON_BLANK233)
 DEF_ICON(ICON_BLANK234)
-DEF_ICON(ICON_UV_VERTEXSEL)
-DEF_ICON(ICON_UV_EDGESEL)
-DEF_ICON(ICON_UV_FACESEL)
-DEF_ICON(ICON_UV_ISLANDSEL)
+DEF_ICON(ICON_BLANK235)
+DEF_ICON(ICON_BLANK236)
+DEF_ICON(ICON_BLANK237)
+DEF_ICON(ICON_BLANK238)
 DEF_ICON(ICON_BLANK239)
 DEF_ICON(ICON_BLANK240)
 DEF_ICON(ICON_BLANK241)