[Bf-blender-cvs] [7a085b4] master: Revised the debug code added in the commit rB4958aff780a3 according to the raised concern.

Tamito Kajiyama noreply at git.blender.org
Sat May 17 10:41:59 CEST 2014


Commit: 7a085b4c852c756a3f11282cddfc0598caaaf4f7
Author: Tamito Kajiyama
Date:   Sat May 17 17:40:04 2014 +0900
https://developer.blender.org/rB7a085b4c852c756a3f11282cddfc0598caaaf4f7

Revised the debug code added in the commit rB4958aff780a3 according to the raised concern.

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

M	source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

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

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index c6041e6..e437b8f 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -521,14 +521,11 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
 		}
 		else {
 			RE_vlakren_get_normal(_re, obi, vlr, facenormal);
-			if (G.debug & G_DEBUG_FREESTYLE) {
-				float dist, tmpNor[3];
-				normal_tri_v3(tmpNor, v3, v2, v1); /* normals are inverted in rendering */
-				dist = len_v3v3(facenormal, tmpNor);
-				if (dist > 1.0f) {
-					printf("Warning: vlak %d has an incorrect normal (dist. %.3g)\n", p, dist);
-				}
-			}
+#ifndef NDEBUG
+			float tnor[3];
+			normal_tri_v3(tnor, v3, v2, v1);  /* normals are inverted in rendering */
+			BLI_assert(dot_v3v3(tnor, facenormal) > 0.0f);
+#endif
 			copy_v3_v3(n1, facenormal);
 			copy_v3_v3(n2, facenormal);
 			copy_v3_v3(n3, facenormal);




More information about the Bf-blender-cvs mailing list