[Bf-blender-cvs] [d2ac3ab] master: Compilation error fixes for strict compiler flags

Sergey Sharybin noreply at git.blender.org
Tue Apr 28 21:24:17 CEST 2015


Commit: d2ac3abbc2f9c66f5912b92768765ea326f800c5
Author: Sergey Sharybin
Date:   Wed Apr 29 00:23:52 2015 +0500
Branches: master
https://developer.blender.org/rBd2ac3abbc2f9c66f5912b92768765ea326f800c5

Compilation error fixes for strict compiler flags

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

M	source/blender/editors/screen/glutil.c
M	source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp

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

diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index 1ab03bf..f29ba78 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -991,7 +991,7 @@ void bgl_get_mats(bglMats *mats)
 /**
  * \note \a viewdist is only for ortho at the moment.
  */
-void bglPolygonOffset(float viewdist, float dist)
+void bglPolygonOffset(float UNUSED(viewdist), float dist)
 {
 	static float winmat[16], offset = 0.0;
 	
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 8a7753e..291ed98 100644
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -213,7 +213,7 @@ static char *escape_quotes(char *name)
 
 static char * create_lineset_handler(char *layer_name, char *lineset_name)
 {
-	char *fmt = "__import__('parameter_editor').process('%s', '%s')\n";
+	const char *fmt = "__import__('parameter_editor').process('%s', '%s')\n";
 	char *s1 = escape_quotes(layer_name);
 	char *s2 = escape_quotes(lineset_name);
 	char *text = BLI_sprintfN(fmt, s1, s2);




More information about the Bf-blender-cvs mailing list