[Bf-blender-cvs] [fe654a9] blender2.8: Gawain: allow strips of 1 line, fans of 1 triangle

Mike Erwin noreply at git.blender.org
Fri Oct 7 02:57:05 CEST 2016


Commit: fe654a93c7ecdc18089730ad62a15e6b7571ba11
Author: Mike Erwin
Date:   Thu Oct 6 20:05:06 2016 -0400
Branches: blender2.8
https://developer.blender.org/rBfe654a93c7ecdc18089730ad62a15e6b7571ba11

Gawain: allow strips of 1 line, fans of 1 triangle

My initial tests were stricter than necessary, and blocked some valid uses. Fixed!

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

M	source/blender/gpu/gawain/immediate.c

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

diff --git a/source/blender/gpu/gawain/immediate.c b/source/blender/gpu/gawain/immediate.c
index e0d1490..b7b3083 100644
--- a/source/blender/gpu/gawain/immediate.c
+++ b/source/blender/gpu/gawain/immediate.c
@@ -133,12 +133,12 @@ static bool vertex_count_makes_sense_for_primitive(unsigned vertex_ct, GLenum pr
 			return vertex_ct % 2 == 0;
 		case GL_LINE_STRIP:
 		case GL_LINE_LOOP:
-			return vertex_ct > 2; // otherwise why bother?
+			return vertex_ct >= 2;
 		case GL_TRIANGLES:
 			return vertex_ct % 3 == 0;
 		case GL_TRIANGLE_STRIP:
 		case GL_TRIANGLE_FAN:
-			return vertex_ct > 3; // otherwise why bother?
+			return vertex_ct >= 3;
   #ifdef WITH_GL_PROFILE_COMPAT
 		case GL_QUADS:
 			return vertex_ct % 4 == 0;




More information about the Bf-blender-cvs mailing list