archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix [#20437] Impossible to load "voxel data" sequence file from

Browse Source 
texture panel (field missing?)
This commit is contained in:
Matt Ebb
2010-01-15 07:26:38 +00:00
parent 3664670f2a
commit 0e8dd13c48
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/ui/properties_texture.py
View 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()

12
source/blender/makesrna/intern/rna_texture.c
View 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)