[Bf-blender-cvs] [c23d29c] master: Fix T45465

Antony Riakiotakis noreply at git.blender.org
Fri Jul 17 13:28:16 CEST 2015


Commit: c23d29c58e8cc2aae42bd647fbc42cff982354d6
Author: Antony Riakiotakis
Date:   Fri Jul 17 13:24:01 2015 +0200
Branches: master
https://developer.blender.org/rBc23d29c58e8cc2aae42bd647fbc42cff982354d6

Fix T45465

Easy one, we don't draw quads anymore. Also normal
didn't use polygon index

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

M	source/blender/blenkernel/intern/cdderivedmesh.c

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

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 69e69bf..4820514 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -896,7 +896,7 @@ static void cdDM_drawMappedFacesGLSL(
 				if (do_draw)
 					DM_vertex_attributes_from_gpu(dm, &gattribs, &attribs);
 
-				glBegin(GL_QUADS);
+				glBegin(GL_TRIANGLES);
 			}
 
 			if (!do_draw) {
@@ -917,7 +917,7 @@ static void cdDM_drawMappedFacesGLSL(
 
 			if (!smoothnormal) {
 				if (nors) {
-					glNormal3fv(nors[a]);
+					glNormal3fv(nors[lt->poly]);
 				}
 				else {
 					/* TODO ideally a normal layer should always be available */




More information about the Bf-blender-cvs mailing list