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/editors/space_outliner | |
| 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/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 0388ba86b84..4fa8686bce3 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -1851,7 +1851,7 @@ static int material_drop_invoke(bContext *C, wmOperator *op, wmEvent *event) return OPERATOR_CANCELLED; } - assign_material(ob, ma, ob->totcol + 1); + assign_material(ob, ma, ob->totcol + 1, BKE_MAT_ASSIGN_USERPREF); DAG_ids_flush_update(bmain, 0); WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C)); |