diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-07 16:38:03 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-07 16:38:03 +0300 |
| commit | 8e9c7f70c80cbe1a6a67c3f7c639b0939982b332 (patch) | |
| tree | 675a759a445dca018d31f580038655b69b35bacb /source/blender/blenkernel/intern/object.c | |
| parent | ac0b89f6566981fb608ce33a0e6995798fc70d7f (diff) | |
| parent | aa3fc89257f839260e7577881f399011a709badf (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 845f0d9da4e..21adc5dde2a 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -99,6 +99,7 @@ #include "BKE_editmesh.h" #include "BKE_mball.h" #include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_node.h" #include "BKE_object.h" #include "BKE_object_deform.h" @@ -284,6 +285,12 @@ void BKE_object_link_modifiers(struct Object *ob_dst, struct Object *ob_src) nmd = modifier_new(md->type); BLI_strncpy(nmd->name, md->name, sizeof(nmd->name)); + + if (md->type == eModifierType_Multires) { + /* Has to be done after mod creation, but *before* we actually copy its settings! */ + multiresModifier_sync_levels_ex(ob_dst, (MultiresModifierData *)md, (MultiresModifierData *)nmd); + } + modifier_copyData(md, nmd); BLI_addtail(&ob_dst->modifiers, nmd); modifier_unique_name(&ob_dst->modifiers, nmd); |