diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-09 02:24:41 +0400 |
| commit | 3c4987f98378d44eda133311c65aa19412e4cd38 (patch) | |
| tree | 4371b4117d3290e60a58190481e926ebb17fcf28 /source/blender/makesrna/intern/rna_scene.c | |
| parent | ec33687d6cf74775e37fdc1a14e22dea08289cb1 (diff) | |
Fix for a number of compiler warnings as well as a bug hidden by the warnings.
Patch contribution by Bastien Montagne, thanks!
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 6527fe29263..0e9b6a7d9a2 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1466,12 +1466,12 @@ static PointerRNA rna_FreestyleSettings_active_lineset_get(PointerRNA *ptr) return rna_pointer_inherit_refine(ptr, &RNA_FreestyleLineSet, lineset); } -static void rna_FreestyleSettings_active_lineset_index_range(PointerRNA *ptr, int *min, int *max) +static void rna_FreestyleSettings_active_lineset_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax) { - FreestyleConfig *config= (FreestyleConfig *)ptr->data; - *min= 0; - *max= BLI_countlist(&config->linesets)-1; - *max= MAX2(0, *max); + FreestyleConfig *config = (FreestyleConfig *)ptr->data; + + *min = 0; + *max = max_ii(0, BLI_countlist(&config->linesets) - 1); } static int rna_FreestyleSettings_active_lineset_index_get(PointerRNA *ptr) |