Fix for a number of compiler warnings as well as a bug hidden by the warnings.

Patch contribution by Bastien Montagne, thanks!

2 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 2b2e92f57dd..8f2c00bf0f7 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -630,7 +630,7 @@ void BlenderFileLoader::insertShapeNode(ObjectInstanceRen *obi, int id)
 				cleanVertices[detri.viP+2] += 1e-5 * detri.v.z();
 			}
 		}
-		printf("Warning: Object %s contains %d degenerate triangle%s (strokes may be incorrect)\n",
+		printf("Warning: Object %s contains %lu degenerated triangle%s (strokes may be incorrect)\n",
 			name, detriList.size(), (detriList.size() > 1) ? "s" : "");
 	}
 
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 369418cb07a..656d7a23659 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -56,8 +56,8 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count)
 	freestyle_scene->r.ysch= re->recty; // old_scene->r.ysch
 	freestyle_scene->r.xasp= 1.f; // old_scene->r.xasp;
 	freestyle_scene->r.yasp= 1.f; // old_scene->r.yasp;
-	freestyle_scene->r.xparts= old_scene->r.xparts;
-	freestyle_scene->r.yparts= old_scene->r.yparts;
+	freestyle_scene->r.tilex= old_scene->r.tilex;
+	freestyle_scene->r.tiley= old_scene->r.tiley;
 	freestyle_scene->r.size= 100; // old_scene->r.size
 	freestyle_scene->r.maximsize= old_scene->r.maximsize;
 	freestyle_scene->r.ocres = old_scene->r.ocres;