[Bf-blender-cvs] [39ad2cd] master: Fix lamps drawing only partially in OpenGL render.

[Brecht Van Lommel]

Commit: 39ad2cd8f8ae97f58f9ddbe7462b5249df4e4692
Author: Brecht Van Lommel
Date:   Wed Feb 5 22:13:18 2014 +0100
https://developer.blender.org/rB39ad2cd8f8ae97f58f9ddbe7462b5249df4e4692

Fix lamps drawing only partially in OpenGL render.

It should draw lamps entirely, this happened due to hack to hide object centers.

===================================================================

M	source/blender/editors/render/render_opengl.c
M	source/blender/editors/space_view3d/drawobject.c

===================================================================

diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index a254cd0..354ea4d 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -90,8 +90,6 @@ typedef struct OGLRender {
 	ScrArea *prevsa;
 	ARegion *prevar;
 
-	short obcenter_dia_back; /* temp overwrite */
-
 	bool is_sequencer;
 	SpaceSeq *sseq;
 
@@ -402,9 +400,6 @@ static bool screen_opengl_render_init(bContext *C, wmOperator *op)
 	}
 
 
-	oglrender->obcenter_dia_back = U.obcenter_dia;
-	U.obcenter_dia = 0;
-
 	oglrender->prevsa = prevsa;
 	oglrender->prevar = prevar;
 
@@ -468,8 +463,6 @@ static void screen_opengl_render_end(bContext *C, OGLRender *oglrender)
 
 	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;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 08c7099..5a7c617 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7336,7 +7336,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 			}
 			else if ((dflag & DRAW_CONSTCOLOR) == 0) {
 				/* we don't draw centers for duplicators and sets */
-				if (U.obcenter_dia > 0) {
+				if (U.obcenter_dia > 0 && !(G.f & G_RENDER_OGL)) {
 					/* check > 0 otherwise grease pencil can draw into the circle select which is annoying. */
 					drawcentercircle(v3d, rv3d, ob->obmat[3], do_draw_center, ob->id.lib || ob->id.us > 1);
 				}