diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-12 21:12:07 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2012-08-12 21:12:07 +0400 |
| commit | 3ebbfe2c406955ed765a697825cde0c891e83a24 (patch) | |
| tree | f4e06ea01bca2221722f93a0c413b7d90712a028 /source/blender/makesrna/intern/rna_object.c | |
| parent | b2fdb3f50e0eb4aa1725c33c54afc0901d829c59 (diff) | |
new parameter in assign_material() to specify where material shall be assigned: object, obdata, by userpref(default) (as discussed with ideasman_42)
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 9770b51654c..e1f45e4de17 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -663,7 +663,7 @@ static void rna_Object_active_material_set(PointerRNA *ptr, PointerRNA value) Object *ob = (Object *)ptr->id.data; DAG_id_tag_update(value.data, 0); - assign_material(ob, value.data, ob->actcol); + assign_material(ob, value.data, ob->actcol, BKE_MAT_ASSIGN_USERPREF); } static void rna_Object_active_particle_system_index_range(PointerRNA *ptr, int *min, int *max, @@ -820,7 +820,7 @@ static void rna_MaterialSlot_material_set(PointerRNA *ptr, PointerRNA value) Object *ob = (Object *)ptr->id.data; int index = (Material **)ptr->data - ob->mat; - assign_material(ob, value.data, index + 1); + assign_material(ob, value.data, index + 1, BKE_MAT_ASSIGN_USERPREF); } static int rna_MaterialSlot_link_get(PointerRNA *ptr) |