diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-05-16 02:23:05 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-05-16 02:23:25 +0400 |
commit | 57e1ec23088f2a4a16bdd27c301e2ffd8bee6cb1 (patch) | |
tree | 9e11b3a08c3ef34bd800d411110915d98faed9dc /source/blender/makesrna/intern/rna_material.c | |
parent | 8b0729a7314324e1aea6655de8bd16bb3e5ff5cc (diff) |
Fix part of T39708, don't overupdate particles when changine active
particle texture slot
Diffstat (limited to 'source/blender/makesrna/intern/rna_material.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_material.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index 061f1595c8c..71b2926e75a 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -2042,7 +2042,7 @@ void RNA_def_material(BlenderRNA *brna) rna_def_animdata_common(srna); rna_def_mtex_common(brna, srna, "rna_Material_mtex_begin", "rna_Material_active_texture_get", "rna_Material_active_texture_set", "rna_Material_active_texture_editable", - "MaterialTextureSlot", "MaterialTextureSlots", "rna_Material_update"); + "MaterialTextureSlot", "MaterialTextureSlots", "rna_Material_update", "rna_Material_update"); /* only material has this one */ prop = RNA_def_property(srna, "use_textures", PROP_BOOLEAN, PROP_NONE); @@ -2103,8 +2103,8 @@ static void rna_def_texture_slots(BlenderRNA *brna, PropertyRNA *cprop, const ch } void rna_def_mtex_common(BlenderRNA *brna, StructRNA *srna, const char *begin, - const char *activeget, const char *activeset, const char *activeeditable, - const char *structname, const char *structname_slots, const char *update) + const char *activeget, const char *activeset, const char *activeeditable, + const char *structname, const char *structname_slots, const char *update, const char *update_index) { PropertyRNA *prop; @@ -2129,7 +2129,7 @@ void rna_def_mtex_common(BlenderRNA *brna, StructRNA *srna, const char *begin, RNA_def_property_int_sdna(prop, NULL, "texact"); RNA_def_property_range(prop, 0, MAX_MTEX - 1); RNA_def_property_ui_text(prop, "Active Texture Index", "Index of active texture slot"); - RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS, update); + RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS, update_index); } #endif |