archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T47051: cycles viewport textured shadeless draw bug.

Browse Source
This commit is contained in:
Brecht Van Lommel
2015-12-23 20:38:58 +01:00
parent eb6a8e4321
commit 93c75bf992
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/gpu/intern/gpu_basic_shader.c
View File

@@ -205,10 +205,15 @@ void GPU_basic_shader_bind(int options)
glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
}
if (options & GPU_SHADER_TEXTURE_2D)
if (options & GPU_SHADER_TEXTURE_2D) {
GLint env_mode = (options & (GPU_SHADER_USE_COLOR|GPU_SHADER_LIGHTING)) ? GL_MODULATE : GL_REPLACE;
glEnable(GL_TEXTURE_2D);
else if (bound_options & GPU_SHADER_TEXTURE_2D)
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, env_mode);
}
else if (bound_options & GPU_SHADER_TEXTURE_2D) {
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
glDisable(GL_TEXTURE_2D);
}
}
GPU_MATERIAL_STATE.bound_options = options;

1
source/blender/gpu/intern/gpu_draw.c
View File

@@ -2113,6 +2113,7 @@ void GPU_state_init(void)
glDisable(GL_STENCIL_TEST);
glDisable(GL_TEXTURE_1D);
glDisable(GL_TEXTURE_2D);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
/* default disabled, enable should be local per function */
glDisableClientState(GL_VERTEX_ARRAY);