[Bf-blender-cvs] [6161e44] master: Quite compiler warnings.

Tamito Kajiyama noreply at git.blender.org
Fri Apr 18 08:03:25 CEST 2014


Commit: 6161e4420e675da867b0ac5c3413ef2a89a66595
Author: Tamito Kajiyama
Date:   Fri Apr 18 09:25:36 2014 +0900
https://developer.blender.org/rB6161e4420e675da867b0ac5c3413ef2a89a66595

Quite compiler warnings.

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

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

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

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 9adf623..a26bb0f 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -761,7 +761,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
 		}
 		if (G.debug & G_DEBUG_FREESTYLE) {
 			printf("Warning: Object %s contains %lu degenerated triangle%s (strokes may be incorrect)\n",
-			       name, detriList.size(), (detriList.size() > 1) ? "s" : "");
+			       name, (long unsigned int)detriList.size(), (detriList.size() > 1) ? "s" : "");
 		}
 	}
 
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
index 25fdc04..84d770a 100644
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
@@ -164,7 +164,7 @@ int ChainSilhouetteIterator::traverse(const AdjacencyIterator& ait)
 			Nature::RIDGE
 		};
 		int numNatures = sizeof(natures) / sizeof(Nature::EdgeNature);
-		for (unsigned int i = 0; i < numNatures; ++i) {
+		for (int i = 0; i < numNatures; ++i) {
 			if (getCurrentEdge()->getNature() & natures[i]) {
 				int n = 0;
 				while (!it.isEnd()) {




More information about the Bf-blender-cvs mailing list