diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-10-25 12:03:05 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-10-25 12:03:05 +0400 |
| commit | d327f08f9a948ac59f90379577366e7a807a2e64 (patch) | |
| tree | 7342b2185e5dfec67f2eefb0af26742e5464257b /source/blender/editors/object/object_transform.c | |
| parent | 01cdd515fb09369b45bab164b8ed10cc39863ca9 (diff) | |
Fix #24255: Multires object gets modified when joining it to another multires object.
Fix #22018: joining objects with different multires levels loses levesl from the higher multires object
- Synchronyze mulires subdivision level when joining objects
- Apply scale on MDISP layer when applying scale
- Re-calculate MDISP when joining scaled objects
Diffstat (limited to 'source/blender/editors/object/object_transform.c')
| -rw-r--r-- | source/blender/editors/object/object_transform.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 7be03a4c567..9d6b5e5002b 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -47,6 +47,7 @@ #include "BKE_mesh.h" #include "BKE_object.h" #include "BKE_report.h" +#include "BKE_multires.h" #include "RNA_define.h" #include "RNA_access.h" @@ -491,6 +492,8 @@ static int apply_objects_internal(bContext *C, ReportList *reports, int apply_lo if(ob->type==OB_MESH) { me= ob->data; + multiresModifier_scale_disp(scene, ob); + /* adjust data */ mvert= me->mvert; for(a=0; a<me->totvert; a++, mvert++) |