From 9a55b0c3ff10d940fae95fd66501a93e32da95b9 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Tue, 18 Aug 2009 16:13:13 +0100 Subject: [PATCH] [cogl-material] Fix some brackets in _layer_flush_gl_sampler_state The wrong part of an expression was bracketed in the test to determine when a new texture matrix needed to be loaded which resulted in the first pass through _cogl_material_layer_flush_gl_sampler_state not uploading any user matrix. --- common/cogl-material.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cogl-material.c b/common/cogl-material.c index 86189b93a..70d139bb2 100644 --- a/common/cogl-material.c +++ b/common/cogl-material.c @@ -1179,7 +1179,7 @@ _cogl_material_layer_flush_gl_sampler_state (CoglMaterialLayer *layer, #ifndef DISABLE_MATERIAL_CACHE if (!(gl_layer_info && gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE && - layer->flags & COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE)) + (layer->flags & COGL_MATERIAL_LAYER_FLAG_DEFAULT_COMBINE))) #endif { GE (glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE)); @@ -1247,9 +1247,9 @@ _cogl_material_layer_flush_gl_sampler_state (CoglMaterialLayer *layer, } #ifndef DISABLE_MATERIAL_CACHE - if (gl_layer_info && - (gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX || - layer->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX)) + if ((gl_layer_info && + gl_layer_info->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX) || + (layer->flags & COGL_MATERIAL_LAYER_FLAG_HAS_USER_MATRIX)) #endif { _cogl_set_current_matrix (COGL_MATRIX_TEXTURE);