Commit: c92c05ed93ed2b174811023cae9ac866d6c3a73c
Author: Campbell Barton
Date: Wed Jun 8 21:35:02 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rBc92c05ed93ed2b174811023cae9ac866d6c3a73c
Fix edit-mesh draw not disabling stipple
Caused problem w/ basic-shader
===================================================================
M source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c
b/source/blender/blenkernel/intern/editderivedmesh.c
index ffd000e..8df07c5 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -1181,6 +1181,10 @@ static void emDM_drawMappedFaces(
/* if non zero we know a face was rendered */
if (poly_prev != GL_ZERO) glEnd();
+
+ if (draw_option_prev == DM_DRAW_OPTION_STIPPLE) {
+ GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+ }
}
static void bmdm_get_tri_uv(BMLoop *ltri[3], MLoopUV *luv[3], const int
cd_loop_uv_offset)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
