diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-08-27 16:11:49 +0400 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:29:21 +0300 |
commit | b331a82910da04b684d680ec94abbf93efbd0696 (patch) | |
tree | c0f6b6748eb56af9923fd8ef20a3d071e17bf921 /source/blender/makesrna/intern/rna_texture.c | |
parent | efc0cd16580bfcafb4abddd5465f197ba1915dd9 (diff) |
Support for various data properties of the hair grid in the voxel
texture.
Diffstat (limited to 'source/blender/makesrna/intern/rna_texture.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 26644ba1a5d..3abe4cde2d0 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -1870,6 +1870,14 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) {0, NULL, 0, NULL, NULL} }; + static EnumPropertyItem hair_type_items[] = { + {TEX_VD_HAIRDENSITY, "HAIRDENSITY", 0, "Density", "Use hair density as texture data"}, + {TEX_VD_HAIRRESTDENSITY, "HAIRRESTDENSITY", 0, "Rest Density", "Use hair rest density as texture data"}, + {TEX_VD_HAIRVELOCITY, "HAIRVELOCITY", 0, "Velocity", "Use hair velocity as texture data"}, + {TEX_VD_HAIRENERGY, "HAIRENERGY", 0, "Energy", "Use potential hair energy as texture data"}, + {0, NULL, 0, NULL, NULL} + }; + srna = RNA_def_struct(brna, "VoxelData", NULL); RNA_def_struct_sdna(srna, "VoxelData"); RNA_def_struct_ui_text(srna, "VoxelData", "Voxel data settings"); @@ -1887,6 +1895,12 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Source", "Simulation value to be used as a texture"); RNA_def_property_update(prop, 0, "rna_Texture_voxeldata_update"); + prop = RNA_def_property(srna, "hair_data_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "hair_type"); + RNA_def_property_enum_items(prop, hair_type_items); + RNA_def_property_ui_text(prop, "Source", "Simulation value to be used as a texture"); + RNA_def_property_update(prop, 0, "rna_Texture_voxeldata_update"); + prop = RNA_def_property(srna, "extension", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "extend"); RNA_def_property_enum_items(prop, voxeldata_extension); |