Fix [#20437] Impossible to load "voxel data" sequence file from
authorMatt Ebb <matt@mke3.net>
Fri, 15 Jan 2010 07:26:38 +0000 (07:26 +0000)
committerMatt Ebb <matt@mke3.net>
Fri, 15 Jan 2010 07:26:38 +0000 (07:26 +0000)
texture panel (field missing?)

release/scripts/ui/properties_texture.py
source/blender/makesrna/intern/rna_texture.c

index 7b70b35573164eb1ed3bd1f92c11b611916a63c3..7aafc3a839fb2038e9f2ef167b9846b6f43d0cc3 100644 (file)
@@ -853,6 +853,8 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel):
             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()
index 79a75c89a08eaf0205b61cfe1ece332cba8767fc..11d99b6f356cc98fd4611b08e59615eb1c901205 100644 (file)
@@ -1772,6 +1772,18 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna)
        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)