* Some more icon file updates (thanks jendrzych), and associated UI tweaks.

1 files changed, 45 insertions, 21 deletions

diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 5012a71a647..b00ac5e58cb 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -64,6 +64,7 @@ typedef enum {
 	ICON_BLANK006,
 	ICON_BLANK007,
 	ICON_BLANK008,
+	ICON_BLANK008b,
 	
 	/* ui */
 	ICON_FULLSCREEN,
@@ -91,6 +92,7 @@ typedef enum {
 	ICON_DOTSDOWN,
 	ICON_LINK,
 	ICON_INLINK,
+	ICON_BLANK012b,
 	
 	/* available */	
 	ICON_BLANK016,
@@ -118,6 +120,7 @@ typedef enum {
 	ICON_BLANK038,
 	ICON_BLANK039,
 	ICON_BLANK040,
+	ICON_BLANK040b,
 	
 	/* BUTTONS */
 	ICON_LAMP,
@@ -145,6 +148,7 @@ typedef enum {
 	ICON_BLANK050,
 	ICON_BLANK051,
 	ICON_BLANK052,
+	ICON_BLANK052b,
 	
 	/* EDITORS */
 	ICON_VIEW3D,
@@ -172,6 +176,7 @@ typedef enum {
 	ICON_BLANK059,
 	ICON_BLANK060,
 	ICON_BLANK061,
+	ICON_BLANK061b,
 	
 	/* MODES */
 	ICON_OBJECTMODE,	// XXX fix this up
@@ -199,10 +204,11 @@ typedef enum {
 	ICON_BLANK075,
 	ICON_BLANK076,
 	ICON_BLANK077,
+	ICON_BLANK077b,
 	
 	/* DATA */
 	ICON_SCENE_DEHLT,
-	ICON_IMAGE_DEHLT,
+	ICON_RENDERLAYERS,
 	ICON_WORLD_DEHLT,
 	ICON_OBJECT,
 	ICON_MESH,
@@ -214,7 +220,7 @@ typedef enum {
 	ICON_TEXTURE_DEHLT,
 	ICON_IPO_DEHLT,
 	ICON_CAMERA_DEHLT,
-	ICON_BLANK078,
+	ICON_PARTICLE_DATA,
 	ICON_LIBRARY_DEHLT,
 	ICON_GROUP,
 	ICON_ARMATURE,
@@ -226,13 +232,14 @@ typedef enum {
 	ICON_BLANK079,
 	ICON_PACKAGE,
 	ICON_UGLYPACKAGE,
+	ICON_BLANK079b,
 	
 	/* DATA */
-	ICON_SCENE_HLT,
-	ICON_IMAGE_HLT,
-	ICON_WORLD_HLT,
-	ICON_OBJECT_HLT,
-	ICON_MESH_HLT,
+	ICON_BRUSH,
+	ICON_IMAGE_DEHLT,
+	ICON_FILE,
+	ICON_FCURVE,
+	ICON_FONT,
 	ICON_CURVE_HLT,
 	ICON_MBALL_HLT,
 	ICON_LATTICE_HLT,
@@ -253,6 +260,7 @@ typedef enum {
 	ICON_BLANK089,
 	ICON_BLANK090,
 	ICON_RNA,
+	ICON_BLANK090b,
 	
 	/* available */
 	ICON_BLANK092,
@@ -280,6 +288,7 @@ typedef enum {
 	ICON_BLANK114,
 	ICON_BLANK115,
 	ICON_BLANK116,
+	ICON_BLANK116b,
 	
 	/* OUTLINER */
 	ICON_OUTLINER_OB_EMPTY,
@@ -290,8 +299,8 @@ typedef enum {
 	ICON_OUTLINER_OB_LAMP,
 	ICON_OUTLINER_OB_CAMERA,
 	ICON_OUTLINER_OB_ARMATURE,
-	ICON_BLANK117,
-	ICON_BLANK118,
+	ICON_OUTLINER_OB_FONT,
+	ICON_OUTLINER_OB_SURFACE,
 	ICON_BLANK119,
 	ICON_BLANK120,
 	ICON_BLANK121,
@@ -307,6 +316,7 @@ typedef enum {
 	ICON_RESTRICT_SELECT_ON,
 	ICON_RESTRICT_RENDER_OFF,
 	ICON_RESTRICT_RENDER_ON,
+	ICON_BLANK127b,
 	
 	/* OUTLINER */
 	ICON_BLANK128,
@@ -334,6 +344,7 @@ typedef enum {
 	ICON_BLANK140,
 	ICON_BLANK141,
 	ICON_BLANK142,
+	ICON_BLANK142b,
 	
 	/* MODIFIERS */
 	ICON_MODIFIER,
@@ -351,16 +362,17 @@ typedef enum {
 	ICON_MOD_ARRAY,
 	ICON_MOD_UVPROJECT,
 	ICON_MOD_DISPLACE,
+	ICON_MOD_CURVE,
+	ICON_MOD_LATTICE,
 	ICON_BLANK143,
-	ICON_BLANK144,
-	ICON_BLANK145,
-	ICON_BLANK146,
+	ICON_MOD_ARMATURE,
 	ICON_BLANK147,
 	ICON_BLANK148,
 	ICON_BLANK149,
 	ICON_BLANK150,
 	ICON_BLANK151,
 	ICON_BLANK152,
+	ICON_BLANK152b,
 	
 	/* available */
 	ICON_BLANK153,
@@ -388,6 +400,7 @@ typedef enum {
 	ICON_BLANK175,
 	ICON_BLANK176,
 	ICON_BLANK177,
+	ICON_BLANK177b,
 	
 	/* ANIMATION */
 	ICON_REC,
@@ -415,6 +428,7 @@ typedef enum {
 	ICON_MUTE_IPO_ON,
 	ICON_BLANK182,
 	ICON_BLANK183,
+	ICON_BLANK183b,
 	
 	/* available */
 	ICON_BLANK184,
@@ -442,12 +456,13 @@ typedef enum {
 	ICON_BLANK206,
 	ICON_BLANK207,
 	ICON_BLANK208,
+	ICON_BLANK208b,
 	
 	/* EDITING */
 	ICON_VERTEXSEL,
 	ICON_EDGESEL,
 	ICON_FACESEL,
-	ICON_BLANK209,
+	ICON_LINKEDSEL,
 	ICON_BLANK210,
 	ICON_ROTATE,
 	ICON_CURSOR,
@@ -469,6 +484,7 @@ typedef enum {
 	ICON_BLANK212,
 	ICON_BLANK213,
 	ICON_BLANK214,
+	ICON_BLANK214b,
 	
 	/* EDITING */
 	ICON_MAN_TRANS,
@@ -479,15 +495,15 @@ typedef enum {
 	ICON_SNAP_GEAR,
 	ICON_SNAP_GEO,
 	ICON_SNAP_NORMAL,
-	ICON_BLANK216,
-	ICON_BLANK217,
-	ICON_BLANK218,
+	ICON_SNAP_VERTEX,
+	ICON_SNAP_EDGE,
+	ICON_SNAP_FACE,
+	ICON_BLANK218b,
 	ICON_STICKY_UVS_LOC,
 	ICON_STICKY_UVS_DISABLE,
 	ICON_STICKY_UVS_VERT,
 	ICON_CLIPUV_DEHLT,
 	ICON_CLIPUV_HLT,
-	ICON_BLANK218b,
 	ICON_BLANK219,
 	ICON_BLANK220,
 	ICON_BLANK221,
@@ -496,6 +512,7 @@ typedef enum {
 	ICON_BLANK224,
 	ICON_BLANK225,
 	ICON_BLANK226,
+	ICON_BLANK226b,
 	
 	/* EDITING */
 	ICON_PASTEDOWN,
@@ -523,6 +540,7 @@ typedef enum {
 	ICON_BLANK245,
 	ICON_BLANK246,
 	ICON_BLANK247,
+	ICON_BLANK247b,
 	
 	/* 3D VIEW */
 	ICON_BBOX,
@@ -550,6 +568,7 @@ typedef enum {
 	ICON_BLANK255,
 	ICON_BLANK256,
 	ICON_BLANK257,
+	ICON_BLANK257b,
 	
 	/* available */
 	ICON_BLANK258,
@@ -577,6 +596,7 @@ typedef enum {
 	ICON_BLANK280,
 	ICON_BLANK281,
 	ICON_BLANK282,
+	ICON_BLANK282b,
 	
 	/* FILE SELECT */
 	ICON_SORTALPHA,
@@ -604,6 +624,7 @@ typedef enum {
 	ICON_BLANK289,
 	ICON_BLANK290,
 	ICON_BLANK291,
+	ICON_BLANK291b,
 
 	/* available */
 	ICON_BLANK292,
@@ -631,6 +652,7 @@ typedef enum {
 	ICON_BLANK314,
 	ICON_BLANK315,
 	ICON_BLANK316,
+	ICON_BLANK316b,
 	
 	/* SHADING / TEXT */
 	ICON_MATPLANE,
@@ -645,11 +667,11 @@ typedef enum {
 	ICON_BLANK320,
 	ICON_BLANK321,
 	ICON_BLANK322,
-	ICON_BLANK5,	// XXX CHANGE TO WORDWRAP
-	ICON_BLANK6,	// XXX CHANGE TO WORDWRAP
-	ICON_SYNTAX,	// XXX CHANGE OFF -> ON
+	ICON_WORDWRAP_OFF,
+	ICON_WORDWRAP_ON,
 	ICON_SYNTAX_OFF,
-	ICON_LINENUMBERS_OFF,	// XXX CREATE NEW
+	ICON_SYNTAX_ON,
+	ICON_LINENUMBERS_OFF,
 	ICON_LINENUMBERS_ON,
 	ICON_SCRIPTPLUGINS,		// XXX CREATE NEW
 	ICON_BLANK323,
@@ -658,6 +680,7 @@ typedef enum {
 	ICON_BLANK326,
 	ICON_BLANK327,
 	ICON_BLANK328,
+	ICON_BLANK328b,
 	
 	/* SEQUENCE / IMAGE EDITOR */
 	ICON_SEQ_SEQUENCER,
@@ -685,6 +708,7 @@ typedef enum {
 	ICON_BLANK344,
 	ICON_BLANK345,
 	ICON_BLANK346,
+	ICON_BLANK346b,
 	
 	/* vector icons */