diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-26 07:55:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-26 07:55:23 +0400 |
| commit | fc95382a977163a1d499c732960e7501cc065833 (patch) | |
| tree | 3bbbe419ba513f030f95715c04a8adb39c6e6579 /source/blender/editors/object | |
| parent | ac2dd4099167d9ab6306f3fcb83610a5d01ffae1 (diff) | |
| parent | ce0ad0b40b93fc6074daaba6ead0e0e82867d4d2 (diff) | |
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index d370e036229..58496a914cb 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -22,8 +22,8 @@ set(INC ../include ../../blenkernel - ../../blenloader ../../blenlib + ../../blenloader ../../bmesh ../../gpu ../../ikplugin @@ -31,8 +31,8 @@ set(INC ../../makesdna ../../makesrna ../../python - ../../windowmanager ../../render/extern/include + ../../windowmanager ../../../../intern/guardedalloc ) diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 0daf73bebba..b22536cc368 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -1010,9 +1010,10 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l MultiresModifierData *mmd= get_multires_modifier(scene, ob, 0); Mesh *me= (Mesh*)ob->data; - *lvl= mmd->lvl; + if(ob->mode==OB_MODE_SCULPT) *lvl= mmd->sculptlvl; + else *lvl= mmd->lvl; - if(mmd->lvl==0) { + if(*lvl==0) { DerivedMesh *tmp_dm= CDDM_from_mesh(me, ob); dm= CDDM_copy(tmp_dm, 0); tmp_dm->release(tmp_dm); @@ -1020,7 +1021,7 @@ static DerivedMesh *multiresbake_create_loresdm(Scene *scene, Object *ob, int *l MultiresModifierData tmp_mmd= *mmd; DerivedMesh *cddm= CDDM_from_mesh(me, ob); - tmp_mmd.lvl= mmd->lvl; + tmp_mmd.lvl= *lvl; dm= multires_dm_create_from_derived(&tmp_mmd, 1, cddm, ob, 0, 0); cddm->release(cddm); } |