[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24594] trunk/blender/source/blender/ makesrna/intern/rna_texture.c: 2.5 Texture RNA:

[Thomas Dinges]

Revision: 24594
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24594
Author:   dingto
Date:     2009-11-16 21:02:58 +0100 (Mon, 16 Nov 2009)

Log Message:
-----------
2.5 Texture RNA:
* Alphabetical Order for Texture Types, this way it's easier to find the texture inside the drop down. 

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_texture.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c	2009-11-16 19:18:04 UTC (rev 24593)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c	2009-11-16 20:02:58 UTC (rev 24594)
@@ -71,36 +71,36 @@
 	Tex *tex= (Tex*)ptr->data;
 
 	switch(tex->type) {
+		case TEX_BLEND:
+			return &RNA_BlendTexture; 
 		case TEX_CLOUDS:
 			return &RNA_CloudsTexture;
-		case TEX_WOOD:
-			return &RNA_WoodTexture;
+		case TEX_DISTNOISE:
+			return &RNA_DistortedNoiseTexture;
+		case TEX_ENVMAP:
+			return &RNA_EnvironmentMapTexture;
+		case TEX_IMAGE:
+			return &RNA_ImageTexture;
+		case TEX_MAGIC:
+			return &RNA_MagicTexture;
 		case TEX_MARBLE:
 			return &RNA_MarbleTexture;
-		case TEX_MAGIC:
-			return &RNA_MagicTexture;
-		case TEX_BLEND:
-			return &RNA_BlendTexture; 
-		case TEX_STUCCI:
-			return &RNA_StucciTexture;
+		case TEX_MUSGRAVE:
+			return &RNA_MusgraveTexture;
 		case TEX_NOISE:
 			return &RNA_NoiseTexture;
-		case TEX_IMAGE:
-			return &RNA_ImageTexture;
 		case TEX_PLUGIN:
 			return &RNA_PluginTexture;
-		case TEX_ENVMAP:
-			return &RNA_EnvironmentMapTexture;
-		case TEX_MUSGRAVE:
-			return &RNA_MusgraveTexture;
+		case TEX_POINTDENSITY:
+			return &RNA_PointDensityTexture;
+		case TEX_STUCCI:
+			return &RNA_StucciTexture;
 		case TEX_VORONOI:
 			return &RNA_VoronoiTexture;
-		case TEX_DISTNOISE:
-			return &RNA_DistortedNoiseTexture;
-		case TEX_POINTDENSITY:
-			return &RNA_PointDensityTexture;
 		case TEX_VOXELDATA:
 			return &RNA_VoxelDataTexture;
+		case TEX_WOOD:
+			return &RNA_WoodTexture;
 		default:
 			return &RNA_Texture;
 	}
@@ -1780,21 +1780,21 @@
 
 	static EnumPropertyItem prop_type_items[] = {
 		{0, "NONE", 0, "None", ""},
-		{TEX_PLUGIN, "PLUGIN", ICON_PLUGIN, "Plugin", ""},
+        {TEX_BLEND, "BLEND", ICON_TEXTURE, "Blend", ""},
+		{TEX_CLOUDS, "CLOUDS", ICON_TEXTURE, "Clouds", ""},
+		{TEX_DISTNOISE, "DISTORTED_NOISE", ICON_TEXTURE, "Distorted Noise", ""},
+		{TEX_ENVMAP, "ENVIRONMENT_MAP", ICON_IMAGE_DATA, "Environment Map", ""},
 		{TEX_IMAGE, "IMAGE", ICON_IMAGE_DATA, "Image or Movie", ""},
-		{TEX_ENVMAP, "ENVIRONMENT_MAP", ICON_IMAGE_DATA, "Environment Map", ""},
-		{TEX_CLOUDS, "CLOUDS", ICON_TEXTURE, "Clouds", ""},
-		{TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", ""},
+		{TEX_MAGIC, "MAGIC", ICON_TEXTURE, "Magic", ""},
 		{TEX_MARBLE, "MARBLE", ICON_TEXTURE, "Marble", ""},
-		{TEX_MAGIC, "MAGIC", ICON_TEXTURE, "Magic", ""},
-		{TEX_BLEND, "BLEND", ICON_TEXTURE, "Blend", ""},
+		{TEX_MUSGRAVE, "MUSGRAVE", ICON_TEXTURE, "Musgrave", ""},
+		{TEX_NOISE, "NOISE", ICON_TEXTURE, "Noise", ""},
+		{TEX_PLUGIN, "PLUGIN", ICON_PLUGIN, "Plugin", ""},
+		{TEX_POINTDENSITY, "POINT_DENSITY", ICON_TEXTURE, "Point Density", ""},
 		{TEX_STUCCI, "STUCCI", ICON_TEXTURE, "Stucci", ""},
-		{TEX_NOISE, "NOISE", ICON_TEXTURE, "Noise", ""},
-		{TEX_MUSGRAVE, "MUSGRAVE", ICON_TEXTURE, "Musgrave", ""},
 		{TEX_VORONOI, "VORONOI", ICON_TEXTURE, "Voronoi", ""},
-		{TEX_DISTNOISE, "DISTORTED_NOISE", ICON_TEXTURE, "Distorted Noise", ""},
-		{TEX_POINTDENSITY, "POINT_DENSITY", ICON_TEXTURE, "Point Density", ""},
 		{TEX_VOXELDATA, "VOXEL_DATA", ICON_TEXTURE, "Voxel Data", ""},
+		{TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", ""},
 		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "Texture", "ID");