diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-09 06:50:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-09 06:50:09 +0400 |
| commit | ecd463d20da56fa8e7a5c2c0849459ff9e320829 (patch) | |
| tree | 470b828e53928a11eff52bc1a29dbc4ff32bec40 /source/blender/editors/render/render_opengl.c | |
| parent | eca9a4ff40fe2a500d300820f564f1a8bfcf4a97 (diff) | |
fix an error rendering opengl weightpaint data wasn't working when python initialized opengl render on startup (needed for testing script).
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
| -rw-r--r-- | source/blender/editors/render/render_opengl.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index be4d54ae2e8..7b4650b61b5 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -309,7 +309,13 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op) oglrender->rv3d= CTX_wm_region_view3d(C); /* MUST be cleared on exit */ - oglrender->scene->customdata_mask_modal= ED_view3d_datamask(oglrender->scene, oglrender->v3d); + oglrender->scene->customdata_mask_modal = (ED_view3d_datamask(oglrender->scene, oglrender->v3d) | + ED_view3d_object_datamask(oglrender->scene) ); + + /* apply immediately incase we're rendeing from a script, + * running notifiers again will overwrite */ + oglrender->scene->customdata_mask |= oglrender->scene->customdata_mask_modal; + } /* create render */ |