[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26016] trunk/blender: Fix [#20437] Impossible to load "voxel data" sequence file from

[Matt Ebb]

Revision: 26016
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26016
Author:   broken
Date:     2010-01-15 08:26:38 +0100 (Fri, 15 Jan 2010)

Log Message:
-----------
Fix [#20437] Impossible to load "voxel data" sequence file from 
texture panel (field missing?)

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_texture.py
    trunk/blender/source/blender/makesrna/intern/rna_texture.c

Modified: trunk/blender/release/scripts/ui/properties_texture.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_texture.py	2010-01-15 07:04:00 UTC (rev 26015)
+++ trunk/blender/release/scripts/ui/properties_texture.py	2010-01-15 07:26:38 UTC (rev 26016)
@@ -853,6 +853,8 @@
             layout.prop(vd, "resolution")
         elif vd.file_format == 'SMOKE':
             layout.prop(vd, "domain_object")
+        elif vd.file_format == 'IMAGE_SEQUENCE':
+            layout.template_image(tex, "image", tex.image_user) 
 
         layout.prop(vd, "still")
         row = layout.row()

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c	2010-01-15 07:04:00 UTC (rev 26015)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c	2010-01-15 07:26:38 UTC (rev 26016)
@@ -1772,6 +1772,18 @@
 	RNA_def_property_struct_type(prop, "VoxelData");
 	RNA_def_property_ui_text(prop, "Voxel Data", "The voxel data associated with this texture");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
+	
+	prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
+	RNA_def_property_pointer_sdna(prop, NULL, "ima");
+	RNA_def_property_struct_type(prop, "Image");
+	RNA_def_property_flag(prop, PROP_EDITABLE);
+	RNA_def_property_ui_text(prop, "Image", "");
+	RNA_def_property_update(prop, 0, "rna_Texture_update");
+	
+	prop= RNA_def_property(srna, "image_user", PROP_POINTER, PROP_NEVER_NULL);
+	RNA_def_property_pointer_sdna(prop, NULL, "iuser");
+	RNA_def_property_ui_text(prop, "Image User", "Parameters defining which layer, pass and frame of the image is displayed.");
+	RNA_def_property_update(prop, 0, "rna_Texture_update");
 }
 
 static void rna_def_texture(BlenderRNA *brna)