diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2006-12-03 02:37:52 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2006-12-03 02:37:52 +0300 |
| commit | 472c3677fb40750dd944d64bc99c2f3d2c989b05 (patch) | |
| tree | 086aa9fd5c3a5d2bed1f579c08453f70be495594 /source/blender/blenkernel | |
| parent | 76616f2a3bc483e369c7349d2b3e072bde7c7325 (diff) | |
Better integration of multires with editmode. Setting/adding levels no longer exits editmode, and undo should now work as expected. Still to come is loading customdata from the editmesh.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_bad_level_calls.h | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/stubs.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h index 55ebc0a8920..5cc807a68ec 100644 --- a/source/blender/blenkernel/BKE_bad_level_calls.h +++ b/source/blender/blenkernel/BKE_bad_level_calls.h @@ -197,8 +197,9 @@ void post_layer_destroy(struct VLayer *vlayer); void post_server_add(void); /* multires.c */ +struct Multires; struct MultiresLevel; -void multires_free(struct Mesh *me); +void multires_free(struct Multires *mr); void multires_set_level(void *ob, void *me_v); void multires_calc_level_maps(struct MultiresLevel *lvl); struct Multires *multires_copy(struct Multires *orig); diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c index 217a48b13d5..52dedb21302 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c @@ -284,9 +284,9 @@ void post_layer_create(struct VLayer *vlayer) {} void post_layer_destroy(struct VLayer *vlayer) {} void post_server_add(void) {} /* Multires/sculpt stubs */ -void multires_free(struct Mesh *me) {} +void multires_free(struct Multires *mr) {} void multires_set_level(void *ob, void *me_v) {} void multires_calc_level_maps(struct MultiresLevel *lvl) {} -struct Multires *multires_copy(struct Multires *orig) {} +struct Multires *multires_copy(struct Multires *orig) {return NULL;} void sculptmode_init(struct Scene *sce) {} void sculptmode_free_all(struct Scene *sce) {} diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 21003785148..6de2717ba46 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -186,7 +186,7 @@ void free_mesh(Mesh *me) if(me->bb) MEM_freeN(me->bb); if(me->mselect) MEM_freeN(me->mselect); - if(me->mr) multires_free(me); + if(me->mr) multires_free(me->mr); } void copy_dverts(MDeformVert *dst, MDeformVert *src, int copycount) |