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/modifiers/intern/MOD_boolean_util.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/modifiers/intern/MOD_boolean_util.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c index 9ff35c227de..bded11ddfa7 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.c +++ b/source/blender/modifiers/intern/MOD_boolean_util.c @@ -632,7 +632,7 @@ int NewBooleanMesh(Scene *scene, Base *base, Base *base_select, int int_op_type) /* add materials to object */ for (a = 0; a < totmat; a++) - assign_material(ob_new, mat[a], a + 1); + assign_material(ob_new, mat[a], a + 1, BKE_MAT_ASSIGN_USERPREF); MEM_freeN(mat); |