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/blenkernel/BKE_multires.h | |
| 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/blenkernel/BKE_multires.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_multires.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h index fc0ab2eea1e..4a9b2ec5c0d 100644 --- a/source/blender/blenkernel/BKE_multires.h +++ b/source/blender/blenkernel/BKE_multires.h @@ -71,5 +71,8 @@ void multires_free(struct Multires *mr); void multires_load_old(struct Object *ob, struct Mesh *me); void multires_load_old_250(struct Mesh *); +void multiresModifier_scale_disp(struct Scene *scene, struct Object *ob); +void multiresModifier_prepare_join(struct Scene *scene, struct Object *ob, struct Object *to_ob); + #endif |