[Bf-blender-cvs] [24eecb0] master: Cycles: Correction to asserts, they will never trigger before

Sergey Sharybin noreply at git.blender.org
Wed Feb 3 15:06:02 CET 2016


Commit: 24eecb00de225377d5a77e082c1c4eab83f7eecd
Author: Sergey Sharybin
Date:   Wed Feb 3 15:01:26 2016 +0100
Branches: master
https://developer.blender.org/rB24eecb00de225377d5a77e082c1c4eab83f7eecd

Cycles: Correction to asserts, they will never trigger before

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

M	intern/cycles/subd/subd_mesh.cpp

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

diff --git a/intern/cycles/subd/subd_mesh.cpp b/intern/cycles/subd/subd_mesh.cpp
index 9818500..d7cb7b9 100644
--- a/intern/cycles/subd/subd_mesh.cpp
+++ b/intern/cycles/subd/subd_mesh.cpp
@@ -196,17 +196,17 @@ void OpenSubdMesh::add_face(int *index, int num)
 		OsdHbrHalfEdge *opposite = destination->GetEdge(origin);
 
 		if(origin==NULL || destination==NULL)
-			assert("An edge was specified that connected a nonexistent vertex\n");
+			assert(!"An edge was specified that connected a nonexistent vertex\n");
 
 		if(origin == destination)
-			assert("An edge was specified that connected a vertex to itself\n");
+			assert(!"An edge was specified that connected a vertex to itself\n");
 
 		if(opposite && opposite->GetOpposite())
-			assert("A non-manifold edge incident to more than 2 faces was found\n");
+			assert(!"A non-manifold edge incident to more than 2 faces was found\n");
 
 		if(origin->GetEdge(destination)) {
-			assert("An edge connecting two vertices was specified more than once."
-		               "It's likely that an incident face was flipped\n");
+			assert(!"An edge connecting two vertices was specified more than once."
+		                "It's likely that an incident face was flipped\n");
 		}
 	}
 #endif




More information about the Bf-blender-cvs mailing list