[Bf-blender-cvs] [14d0549] blender2.8: Gawain: fix build when TRUST_NO_ONE is disabled

Mike Erwin noreply at git.blender.org
Thu Oct 13 18:24:21 CEST 2016


Commit: 14d054929577e1f3a5d32dbc2faffffbfdea15b3
Author: Mike Erwin
Date:   Thu Oct 13 12:24:01 2016 -0400
Branches: blender2.8
https://developer.blender.org/rB14d054929577e1f3a5d32dbc2faffffbfdea15b3

Gawain: fix build when TRUST_NO_ONE is disabled

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

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

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

diff --git a/source/blender/gpu/gawain/element.c b/source/blender/gpu/gawain/element.c
index 385705c..953042b 100644
--- a/source/blender/gpu/gawain/element.c
+++ b/source/blender/gpu/gawain/element.c
@@ -23,7 +23,9 @@ unsigned ElementList_size(const ElementList* elem)
 		case GL_UNSIGNED_SHORT: return elem->index_ct * sizeof(GLushort);
 		case GL_UNSIGNED_INT: return elem->index_ct * sizeof(GLuint);
 		default:
+	#if TRUST_NO_ONE
 			assert(false);
+	#endif
 			return 0;
 		}
 
@@ -69,7 +71,10 @@ void ElementListBuilder_init(ElementListBuilder* builder, GLenum prim_type, unsi
 			verts_per_prim = 3;
 			break;
 		default:
+#if TRUST_NO_ONE
 			assert(false);
+#endif
+			return;
 		}
 
 	builder->max_allowed_index = vertex_ct - 1;




More information about the Bf-blender-cvs mailing list