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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-04-28 22:23:52 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-04-28 22:23:52 +0300
commitd2ac3abbc2f9c66f5912b92768765ea326f800c5 (patch)
treed1160f460f887279be673484422484e9f625c770
parent859ac8fbc6eaaa303b04839538b590a5a240f857 (diff)
Compilation error fixes for strict compiler flags
-rw-r--r--source/blender/editors/screen/glutil.c2
-rw-r--r--source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index 1ab03bfb7ef..f29ba785180 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 8a7753eda92..291ed98f905 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);