Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2010-12-13 13:24:05 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2010-12-13 13:24:05 +0300
commitc85adcc2e439b7ecfede6e01a6e21f2f6258406b (patch)
treec4e9d628b9b24b6d071a0e5873857a7aebe8e274 /source/blender/blenkernel/intern/multires.c
parent4cd06a6526ddb837d445a25c081dce75c2ece979 (diff)
Use mdisps layer from edit_mesh when adding/removing multires modifier
when object is in edit mode.
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r--source/blender/blenkernel/intern/multires.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 7f7433f8965..802bc32f571 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -37,6 +37,7 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_pbvh.h"
+#include "BLI_editVert.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h"
@@ -278,7 +279,10 @@ void multiresModifier_set_levels_from_disps(MultiresModifierData *mmd, Object *o
Mesh *me = ob->data;
MDisps *mdisp;
- mdisp = CustomData_get_layer(&me->fdata, CD_MDISPS);
+ if(me->edit_mesh)
+ mdisp = CustomData_get_layer(&me->edit_mesh->fdata, CD_MDISPS);
+ else
+ mdisp = CustomData_get_layer(&me->fdata, CD_MDISPS);
if(mdisp) {
mmd->totlvl = get_levels_from_disps(ob);