[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29608] trunk/blender/source/blender: slight cleaning of texture type changing functionality, done while working on other stuff today

[Matt Ebb]

Revision: 29608
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29608
Author:   broken
Date:     2010-06-22 11:13:30 +0200 (Tue, 22 Jun 2010)

Log Message:
-----------
slight cleaning of texture type changing functionality, done while working on other stuff today

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_texture.h
    trunk/blender/source/blender/blenkernel/intern/texture.c
    trunk/blender/source/blender/makesrna/intern/rna_texture.c

Modified: trunk/blender/source/blender/blenkernel/BKE_texture.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_texture.h	2010-06-22 09:12:22 UTC (rev 29607)
+++ trunk/blender/source/blender/blenkernel/BKE_texture.h	2010-06-22 09:13:30 UTC (rev 29608)
@@ -64,6 +64,7 @@
 
 void default_tex(struct Tex *tex);
 struct Tex *add_texture(const char *name);
+void tex_set_type(struct Tex *tex, int type);
 void default_mtex(struct MTex *mtex);
 struct MTex *add_mtex(void);
 struct Tex *copy_texture(struct Tex *tex);

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2010-06-22 09:12:22 UTC (rev 29607)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2010-06-22 09:13:30 UTC (rev 29608)
@@ -509,6 +509,27 @@
 	tex->preview = NULL;
 }
 
+void tex_set_type(Tex *tex, int type)
+{
+	switch(type) {
+			
+		case TEX_VOXELDATA:
+			if (tex->vd == NULL)
+				tex->vd = BKE_add_voxeldata();
+			break;
+		case TEX_POINTDENSITY:
+			if (tex->pd == NULL)
+				tex->pd = BKE_add_pointdensity();
+			break;
+		case TEX_ENVMAP:
+			if (tex->env == NULL)
+				tex->env = BKE_add_envmap();
+			break;
+	}
+	
+	tex->type = type;
+}
+
 /* ------------------------------------------------------------------------- */
 
 Tex *add_texture(const char *name)

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c	2010-06-22 09:12:22 UTC (rev 29607)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c	2010-06-22 09:13:30 UTC (rev 29608)
@@ -160,24 +160,8 @@
 static void rna_Texture_type_set(PointerRNA *ptr, int value)
 {
 	Tex *tex= (Tex*)ptr->data;
-
-	switch(value) {
-
-		case TEX_VOXELDATA:
-			if (tex->vd == NULL)
-				tex->vd = BKE_add_voxeldata();
-			break;
-		case TEX_POINTDENSITY:
-			if (tex->pd == NULL)
-				tex->pd = BKE_add_pointdensity();
-			break;
-		case TEX_ENVMAP:
-			if (tex->env == NULL)
-				tex->env = BKE_add_envmap();
-			break;
-	}
 	
-	tex->type = value;
+	tex_set_type(tex, value);
 }
 
 void rna_TextureSlot_update(Main *bmain, Scene *scene, PointerRNA *ptr)