Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-17 12:40:04 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-17 12:40:04 +0400
commit7a085b4c852c756a3f11282cddfc0598caaaf4f7 (patch)
tree2ea73b342c32ceff1b52039c503ebc2d84e333a5 /source/blender/freestyle/intern
parent575d3dd5baf5786eacc9a0fc85cb48924ee65af3 (diff)
Revised the debug code added in the commit rB4958aff780a3 according to the raised concern.
Diffstat (limited to 'source/blender/freestyle/intern')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index c6041e65653..e437b8fe0c9 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);