diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 17:11:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-01-20 17:16:22 +0400 |
| commit | 018fe81779e81ad43b16c74969764ae3b71d4b40 (patch) | |
| tree | d7b0c1a56e74055ea20358d2d88fa41090245a73 /source/blender/editors/render | |
| parent | aa18c4c445cbe7e5cbf0b766a42cfc9e4b764002 (diff) | |
Fix T38269: scene full copy in mesh edit or sculpt mode did not copy mesh edits.
Diffstat (limited to 'source/blender/editors/render')
| -rw-r--r-- | source/blender/editors/render/render_internal.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index ae3ccf644a2..b2eefe63102 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -70,6 +70,7 @@ #include "ED_object.h" #include "ED_render.h" #include "ED_screen.h" +#include "ED_util.h" #include "ED_view3d.h" #include "RE_pipeline.h" @@ -772,11 +773,8 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even /* handle UI stuff */ WM_cursor_wait(1); - /* flush multires changes (for sculpt) */ - multires_force_render_update(active_object); - - /* flush changes from dynamic topology sculpt */ - sculptsession_bm_to_me_for_render(active_object); + /* flush sculpt and editmode changes */ + ED_editors_flush_edits(C, true); /* cleanup sequencer caches before starting user triggered render. * otherwise, invalidated cache entries can make their way into @@ -784,9 +782,6 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even * since sequence rendering can call that recursively... (peter) */ BKE_sequencer_cache_cleanup(); - /* get editmode results */ - ED_object_editmode_load(CTX_data_edit_object(C)); - // store spare // get view3d layer, local layer, make this nice api call to render // store spare |