diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-01 18:34:12 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-01 18:34:12 +0400 |
| commit | c8cf9415dede94971252b545bf97ca0b46be70d1 (patch) | |
| tree | 863d75aca580a039a7ad7daaa869f9dea5f1e479 /source/blender/editors/render/render_opengl.c | |
| parent | 04cbb3ad149563035e6606db48040e4ef00f1762 (diff) | |
Fix #35149: solidify modifier + vertex parent not working after going in and out
of editmode on the child object.
Problem was that the object custom data mask was not taken into account when
rebuilding the derivedmesh in some cases, which is needed for the derivedmesh
to contain the mapping back to the original vertices. Now this data mask is
used for any derivedmesh build that will be cached.
Also problematic was that the datamask for the active object was applied to
all objects in the scene, which caused the parent object to be recalculated
when it didn't need to be. Now this datamask is only used for the active object.
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index edef6e52e40..659293f8fa0 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -407,8 +407,7 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->rv3d = oglrender->ar->regiondata; /* MUST be cleared on exit */ - oglrender->scene->customdata_mask_modal = (ED_view3d_datamask(oglrender->scene, oglrender->v3d) | - ED_view3d_object_datamask(oglrender->scene)); + oglrender->scene->customdata_mask_modal = ED_view3d_datamask(oglrender->scene, oglrender->v3d); /* apply immediately in case we're rendering from a script, * running notifiers again will overwrite */ |