diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2007-01-27 21:11:07 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2007-01-27 21:11:07 +0300 |
| commit | 5d4b81b688012a50cb1d310091c3ad7973c0a8e8 (patch) | |
| tree | 660d28ffb1a6f60d12960a7f3b0a9074ceb51d2a /source/blender/src/editmesh.c | |
| parent | 901313be99ee41b42b2d19558a1a0ba2e13b147e (diff) | |
== Retopo ==
Fixed bug #5829, Exiting editmode with TAB key toggles RETOPO
* Moved the retopo_mode setting to ToolSettings.
* Renamed the other retopo_mode to the (more accurate) retopo_paint_tool
Diffstat (limited to 'source/blender/src/editmesh.c')
| -rw-r--r-- | source/blender/src/editmesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c index 4c1637a6221..7bd2689f773 100644 --- a/source/blender/src/editmesh.c +++ b/source/blender/src/editmesh.c @@ -619,7 +619,7 @@ void free_editMesh(EditMesh *em) if(em->retopo_paint_data) retopo_free_paint_data(em->retopo_paint_data); em->retopo_paint_data= NULL; - em->retopo_mode= 0; + G.scene->toolsettings->retopo_mode&= ~RETOPO_PAINT; } /* on G.editMesh */ @@ -1930,7 +1930,7 @@ static void *editMesh_to_undoMesh(void) } um->retopo_paint_data= retopo_paint_data_copy(em->retopo_paint_data); - um->retopo_mode= em->retopo_mode; + um->retopo_mode= G.scene->toolsettings->retopo_mode; { Multires *mr= get_mesh(G.obedit)->mr; @@ -2060,8 +2060,8 @@ static void undoMesh_to_editMesh(void *umv) retopo_free_paint(); em->retopo_paint_data= retopo_paint_data_copy(um->retopo_paint_data); - em->retopo_mode= um->retopo_mode; - if(em->retopo_mode) { + G.scene->toolsettings->retopo_mode= um->retopo_mode; + if(G.scene->toolsettings->retopo_mode) { if(G.vd->depths) G.vd->depths->damaged= 1; retopo_queue_updates(G.vd); retopo_paint_view_update(G.vd); |