From 2f34d14cb46d8ccaff94b1bbf03c9bcf72c5f970 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 6 Mar 2009 03:43:24 +0000 Subject: [PATCH] Explicitly make the modelview-matrix current in cogl_{rotate,transform,etc} Its not intended that users should use these with any other matrix mode, and internally we now have the _cogl_current_matrix API if we need to play with other modes. --- clutter/cogl/common/cogl-current-matrix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/clutter/cogl/common/cogl-current-matrix.c b/clutter/cogl/common/cogl-current-matrix.c index 498484e9a..ddddd6249 100644 --- a/clutter/cogl/common/cogl-current-matrix.c +++ b/clutter/cogl/common/cogl-current-matrix.c @@ -307,30 +307,35 @@ _cogl_current_matrix_state_flush (void) void cogl_push_matrix (void) { + _cogl_set_current_matrix (GL_MODELVIEW); _cogl_current_matrix_push (); } void cogl_pop_matrix (void) { + _cogl_set_current_matrix (GL_MODELVIEW); _cogl_current_matrix_pop (); } void cogl_scale (float x, float y, float z) { + _cogl_set_current_matrix (GL_MODELVIEW); _cogl_current_matrix_scale (x, y, z); } void cogl_translate (float x, float y, float z) { + _cogl_set_current_matrix (GL_MODELVIEW); _cogl_current_matrix_translate (x, y, z); } void cogl_rotate (float angle, float x, float y, float z) { + _cogl_set_current_matrix (GL_MODELVIEW); _cogl_current_matrix_rotate (angle, x, y, z); }