* Updated a whole swag of excellent new icons by jendryzch.

This includes a bunch of new object primitive icons 
which would be great to get into the 'add object' menus, 
they're not there yet. The specific lamp data type icons 
are now used in the outliner though, which is very helpful.

1 files changed, 195 insertions, 27 deletions

diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h
index 09635f3d914..4d601f71aea 100644
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@ -40,7 +40,7 @@ typedef enum {
 #define BIFICONID_FIRST		(ICON_BLENDER)
 	/* ui */
 	ICON_BLENDER,
-	ICON_HELP,
+	ICON_QUESTION,
 	ICON_ERROR,
 	ICON_BLANK1,	// XXX this is used lots, it's not actually 'blank'
 	ICON_TRIA_RIGHT,
@@ -94,22 +94,22 @@ typedef enum {
 	ICON_INLINK,
 	ICON_BLANK012b,
 	
-	/* available */	
-	ICON_BLANK016,
-	ICON_BLANK017,
-	ICON_BLANK018,
-	ICON_BLANK019,
-	ICON_BLANK020,
-	ICON_BLANK021,
-	ICON_BLANK022,
-	ICON_BLANK023,
-	ICON_BLANK024,
-	ICON_BLANK025,
-	ICON_BLANK026,
-	ICON_BLANK027,
-	ICON_BLANK028,
-	ICON_BLANK029,
-	ICON_BLANK030,
+	/* various ui */	
+	ICON_HELP,
+	ICON_GHOSTDRAW,
+	ICON_COLOR,
+	ICON_LINKED,
+	ICON_UNLINKED,
+	ICON_HAND,
+	ICON_ZOOM_ALL,
+	ICON_ZOOM_SELECTED,
+	ICON_ZOOM_PREVIOUS,
+	ICON_ZOOM_IN,
+	ICON_ZOOM_OUT,
+	ICON_RENDER_REGION,
+	ICON_BORDER_RECT,
+	ICON_BORDER_LASSO,
+	ICON_FREEZE,
 	ICON_BLANK031,
 	ICON_BLANK032,
 	ICON_BLANK033,
@@ -228,7 +228,7 @@ typedef enum {
 	ICON_BONE_DATA,
 	ICON_CONSTRAINT,
 	ICON_SHAPEKEY_DATA,
-	ICON_VGROUP,
+	ICON_BLANK079a,
 	ICON_BLANK079,
 	ICON_PACKAGE,
 	ICON_UGLYPACKAGE,
@@ -248,15 +248,15 @@ typedef enum {
 	ICON_BLANK080E,
 	ICON_BLANK080F,
 	ICON_BLANK080,
-	ICON_BLANK081,
+	ICON_STRANDS,
 	ICON_LIBRARY_DATA_INDIRECT,
 	ICON_BLANK082,
 	ICON_BLANK083,
 	ICON_BLANK084,
-	ICON_BLANK085,
-	ICON_BLANK086,
-	ICON_BLANK087,
-	ICON_BLANK088,
+	ICON_GROUP_BONE,
+	ICON_GROUP_VERTEX,
+	ICON_GROUP_VCOL,
+	ICON_GROUP_UVS,
 	ICON_BLANK089,
 	ICON_BLANK090,
 	ICON_RNA,
@@ -327,9 +327,9 @@ typedef enum {
 	ICON_OUTLINER_DATA_LAMP,
 	ICON_OUTLINER_DATA_CAMERA,
 	ICON_OUTLINER_DATA_ARMATURE,
+	ICON_OUTLINER_DATA_FONT,
+	ICON_OUTLINER_DATA_SURFACE,
 	ICON_OUTLINER_DATA_POSE,
-	ICON_OUTLINER_DATA_GENERIC,
-	ICON_BLANK128b,
 	ICON_BLANK129,
 	ICON_BLANK130,
 	ICON_BLANK131,
@@ -346,6 +346,174 @@ typedef enum {
 	ICON_BLANK142,
 	ICON_BLANK142b,
 	
+	/* PRIMITIVES */
+	ICON_MESH_PLANE,
+	ICON_MESH_CUBE,
+	ICON_MESH_CIRCLE,
+	ICON_MESH_UVSPHERE,
+	ICON_MESH_ICOSPHERE,
+	ICON_MESH_GRID,
+	ICON_MESH_MONKEY,
+	ICON_MESH_TUBE,
+	ICON_MESH_DONUT,
+	ICON_MESH_CONE,
+	ICON_BLANK610,
+	ICON_BLANK611,
+	ICON_LAMP_POINT,
+	ICON_LAMP_SUN,
+	ICON_LAMP_SPOT,
+	ICON_LAMP_HEMI,
+	ICON_LAMP_AREA,
+	ICON_BLANK617,
+	ICON_BLANK618,
+	ICON_BLANK619,
+	ICON_META_PLANE,
+	ICON_META_CUBE,
+	ICON_META_BALL,
+	ICON_META_ELLIPSOID,
+	ICON_META_TUBE,
+	ICON_BLANK625,
+	
+	/* PRIMITIVES */
+	ICON_SURFACE_NCURVE,
+	ICON_SURFACE_NCIRCLE,
+	ICON_SURFACE_NSURFACE,
+	ICON_SURFACE_NTUBE,
+	ICON_SURFACE_NSPHERE,
+	ICON_SURFACE_NDONUT,
+	ICON_BLANK636,
+	ICON_BLANK637,
+	ICON_BLANK638,
+	ICON_CURVE_BEZCURVE,
+	ICON_CURVE_BEZCIRCLE,
+	ICON_CURVE_NCURVE,
+	ICON_CURVE_NCIRCLE,
+	ICON_CURVE_PATH,
+	ICON_BLANK644,
+	ICON_BLANK645,
+	ICON_BLANK646,
+	ICON_BLANK647,
+	ICON_BLANK648,
+	ICON_BLANK649,
+	ICON_BLANK650,
+	ICON_BLANK651,
+	ICON_BLANK652,
+	ICON_BLANK653,
+	ICON_BLANK654,
+	ICON_BLANK655,
+	
+	/* EMPTY */
+	ICON_BLANK660,
+	ICON_BLANK661,
+	ICON_BLANK662,
+	ICON_BLANK663,
+	ICON_BLANK664,
+	ICON_BLANK665,
+	ICON_BLANK666,
+	ICON_BLANK667,
+	ICON_BLANK668,
+	ICON_BLANK669,
+	ICON_BLANK670,
+	ICON_BLANK671,
+	ICON_BLANK672,
+	ICON_BLANK673,
+	ICON_BLANK674,
+	ICON_BLANK675,
+	ICON_BLANK676,
+	ICON_BLANK677,
+	ICON_BLANK678,
+	ICON_BLANK679,
+	ICON_BLANK680,
+	ICON_BLANK681,
+	ICON_BLANK682,
+	ICON_BLANK683,
+	ICON_BLANK684,
+	ICON_BLANK685,
+	
+	/* EMPTY */
+	ICON_BLANK690,
+	ICON_BLANK691,
+	ICON_BLANK692,
+	ICON_BLANK693,
+	ICON_BLANK694,
+	ICON_BLANK695,
+	ICON_BLANK696,
+	ICON_BLANK697,
+	ICON_BLANK698,
+	ICON_BLANK699,
+	ICON_BLANK700,
+	ICON_BLANK701,
+	ICON_BLANK702,
+	ICON_BLANK703,
+	ICON_BLANK704,
+	ICON_BLANK705,
+	ICON_BLANK706,
+	ICON_BLANK707,
+	ICON_BLANK708,
+	ICON_BLANK709,
+	ICON_BLANK710,
+	ICON_BLANK711,
+	ICON_BLANK712,
+	ICON_BLANK713,
+	ICON_BLANK714,
+	ICON_BLANK715,
+	
+	/* EMPTY */
+	ICON_BLANK720,
+	ICON_BLANK721,
+	ICON_BLANK722,
+	ICON_BLANK733,
+	ICON_BLANK734,
+	ICON_BLANK735,
+	ICON_BLANK736,
+	ICON_BLANK737,
+	ICON_BLANK738,
+	ICON_BLANK739,
+	ICON_BLANK740,
+	ICON_BLANK741,
+	ICON_BLANK742,
+	ICON_BLANK743,
+	ICON_BLANK744,
+	ICON_BLANK745,
+	ICON_BLANK746,
+	ICON_BLANK747,
+	ICON_BLANK748,
+	ICON_BLANK749,
+	ICON_BLANK750,
+	ICON_BLANK751,
+	ICON_BLANK752,
+	ICON_BLANK753,
+	ICON_BLANK754,
+	ICON_BLANK755,
+
+	/* EMPTY */
+	ICON_BLANK760,
+	ICON_BLANK761,
+	ICON_BLANK762,
+	ICON_BLANK763,
+	ICON_BLANK764,
+	ICON_BLANK765,
+	ICON_BLANK766,
+	ICON_BLANK767,
+	ICON_BLANK768,
+	ICON_BLANK769,
+	ICON_BLANK770,
+	ICON_BLANK771,
+	ICON_BLANK772,
+	ICON_BLANK773,
+	ICON_BLANK774,
+	ICON_BLANK775,
+	ICON_BLANK776,
+	ICON_BLANK777,
+	ICON_BLANK778,
+	ICON_BLANK779,
+	ICON_BLANK780,
+	ICON_BLANK781,
+	ICON_BLANK782,
+	ICON_BLANK783,
+	ICON_BLANK784,
+	ICON_BLANK785,
+	
 	/* MODIFIERS */
 	ICON_MODIFIER,
 	ICON_MOD_WAVE,
@@ -507,8 +675,8 @@ typedef enum {
 	ICON_BLANK219,
 	ICON_SNAP_PEEL_OBJECT,
 	ICON_BLANK221,
-	ICON_BLANK222,
-	ICON_BLANK223,
+	ICON_GRID,
+	ICON_GEARS,
 	ICON_BLANK224,
 	ICON_BLANK225,
 	ICON_BLANK226,