From 3c4987f98378d44eda133311c65aa19412e4cd38 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sat, 8 Dec 2012 22:24:41 +0000 Subject: Fix for a number of compiler warnings as well as a bug hidden by the warnings. Patch contribution by Bastien Montagne, thanks! --- source/blender/blenkernel/BKE_linestyle.h | 2 +- source/blender/blenkernel/intern/linestyle.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h index bb763f4e6b3..20e2039c488 100644 --- a/source/blender/blenkernel/BKE_linestyle.h +++ b/source/blender/blenkernel/BKE_linestyle.h @@ -42,7 +42,7 @@ struct Main; struct Object; -FreestyleLineStyle *FRS_new_linestyle(char *name, struct Main *main); +FreestyleLineStyle *FRS_new_linestyle(const char *name, struct Main *main); void FRS_free_linestyle(FreestyleLineStyle *linestyle); FreestyleLineStyle *FRS_copy_linestyle(FreestyleLineStyle *linestyle); diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index 0ed1b02d3c9..43a0daef80c 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -48,7 +48,7 @@ #include "BLI_blenlib.h" -static char *modifier_name[LS_MODIFIER_NUM] = { +static const char *modifier_name[LS_MODIFIER_NUM] = { NULL, "Along Stroke", "Distance from Camera", @@ -95,7 +95,7 @@ static void default_linestyle_settings(FreestyleLineStyle *linestyle) linestyle->caps = LS_CAPS_BUTT; } -FreestyleLineStyle *FRS_new_linestyle(char *name, struct Main *main) +FreestyleLineStyle *FRS_new_linestyle(const char *name, struct Main *main) { FreestyleLineStyle *linestyle; -- cgit v1.2.3