[Bf-blender-cvs] [e8d7a02] master: Fix more cases where gpencil thickness controls line thickness of 3D view elements

Julian Eisel noreply at git.blender.org
Thu Feb 11 21:01:12 CET 2016


Commit: e8d7a0206e994786e2556699d13d54e9517bcbb9
Author: Julian Eisel
Date:   Thu Feb 11 20:54:24 2016 +0100
Branches: master
https://developer.blender.org/rBe8d7a0206e994786e2556699d13d54e9517bcbb9

Fix more cases where gpencil thickness controls line thickness of 3D view elements

We now simple set glLineWidth to 1 once before drawing objects. This way we don't have to do it all over.

Fixes T47396.

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

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

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

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 38af8b7..0874862 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -7503,6 +7503,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 
 	/* only once set now, will be removed too, should become a global standard */
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	/* reset here to avoid having to call all over */
+	glLineWidth(1.0f);
 
 	view3d_cached_text_draw_begin();
 	
@@ -7634,7 +7636,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 					}
 				}
 				else if (ED_view3d_boundbox_clip(rv3d, ob->bb)) {
-					glLineWidth(1.0f);
 					empty_object = drawDispList(scene, v3d, rv3d, base, dt, dflag, ob_wire_col);
 				}
 				break;
@@ -7707,7 +7708,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
 						draw_bounding_volume(ob, ob->boundtype);
 					}
 					else {
-						glLineWidth(1.0f);
 						empty_object = draw_armature(scene, v3d, ar, base, dt, dflag, ob_wire_col, false);
 					}
 				}




More information about the Bf-blender-cvs mailing list