svn merge ^/trunk/blender -r43220:43278 --accept postpone

1 files changed, 14 insertions, 1 deletions

diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index be4d54ae2e8..361b01fe6e0 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -81,6 +81,8 @@ typedef struct OGLRender {
 	RegionView3D *rv3d;
 	ARegion *ar;
 
+	short obcenter_dia_back; /* temp overwrite */
+
 	Image *ima;
 	ImageUser iuser;
 
@@ -303,13 +305,22 @@ static int screen_opengl_render_init(bContext *C, wmOperator *op)
 
 	oglrender->write_still= is_write_still && !is_animation;
 
+	oglrender->obcenter_dia_back = U.obcenter_dia;
+	U.obcenter_dia = 0;
+
 	if(is_view_context) {
 		oglrender->v3d= CTX_wm_view3d(C);
 		oglrender->ar= CTX_wm_region(C);
 		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 */
@@ -354,6 +365,8 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
 	WM_cursor_wait(0);
 	WM_event_add_notifier(C, NC_SCENE|ND_RENDER_RESULT, oglrender->scene);
 
+	U.obcenter_dia = oglrender->obcenter_dia_back;
+
 	GPU_offscreen_free(oglrender->ofs);
 
 	oglrender->scene->customdata_mask_modal= 0;