[Bf-blender-cvs] [4887d4c] gooseberry: Fix T43770, we were doing multiplication with object matrix and not reverting the GL state.

[Antony Riakiotakis]

Commit: 4887d4c52a974e26eeca838bf3ba4ea72e67febb
Author: Antony Riakiotakis
Date:   Mon Feb 23 10:45:54 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB4887d4c52a974e26eeca838bf3ba4ea72e67febb

Fix T43770, we were doing multiplication with object matrix and not
reverting the GL state.

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

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

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c 
b/source/blender/editors/space_view3d/view3d_draw.c
index 401530f..b15c198 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2017,6 +2017,7 @@ static void view3d_draw_nodepth(Scene *scene, ARegion 
*ar, View3D *v3d)
                Object *ob = v3da->base->object;
                next = v3da->next;
 
+               glPushMatrix();
                ED_view3d_init_mats_rv3d_gl(ob, rv3d);
                view3d_cached_text_draw_begin();
                if (ob->type == OB_MESH) {
@@ -2032,6 +2033,8 @@ static void view3d_draw_nodepth(Scene *scene, ARegion 
*ar, View3D *v3d)
                view3d_cached_text_draw_end(v3d, ar, 1, NULL);
                ED_view3d_clear_mats_rv3d(rv3d);
 
+               glPopMatrix();
+
                BLI_remlink(&v3d->afterdraw_nodepth, v3da);
                MEM_freeN(v3da);
        }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs