From 4a99d30538a70b95a2d6cdbf22434aefe5329a10 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 5 Nov 2013 04:32:51 +0000 Subject: [PATCH] code cleanup: quiet warnings --- intern/rigidbody/CMakeLists.txt | 2 +- source/blender/makesrna/intern/rna_fcurve.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/intern/rigidbody/CMakeLists.txt b/intern/rigidbody/CMakeLists.txt index 3a2edba39bc..5d84c2cf082 100644 --- a/intern/rigidbody/CMakeLists.txt +++ b/intern/rigidbody/CMakeLists.txt @@ -26,7 +26,7 @@ set(INC ) set(INC_SYS - ../../extern/bullet2/src + ${BULLET_INCLUDE_DIRS} ) set(SRC diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 4809291e35e..2036257e5d7 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -485,10 +485,10 @@ static void rna_FModifer_end_frame_set(PointerRNA *ptr, float value) } } -static void rna_FModifier_start_frame_range(PointerRNA *ptr, float *min, float *max, - float *softmin, float *softmax) +static void rna_FModifier_start_frame_range(PointerRNA *UNUSED(ptr), float *min, float *max, + float *UNUSED(softmin), float *UNUSED(softmax)) { - FModifier *fcm = (FModifier *)ptr->data; + // FModifier *fcm = (FModifier *)ptr->data; /* Technically, "sfra <= efra" must hold; however, we can't strictly enforce that, * or else it becomes tricky to adjust the range... [#36844] @@ -614,11 +614,11 @@ static void rna_FModifierLimits_maxy_set(PointerRNA *ptr, float value) } } -static void rna_FModifierLimits_minx_range(PointerRNA *ptr, float *min, float *max, +static void rna_FModifierLimits_minx_range(PointerRNA *UNUSED(ptr), float *min, float *max, float *UNUSED(softmin), float *UNUSED(softmax)) { - FModifier *fcm = (FModifier *)ptr->data; - FMod_Limits *data = fcm->data; + // FModifier *fcm = (FModifier *)ptr->data; + // FMod_Limits *data = fcm->data; /* no soft-limits on lower bound - it's too confusing when you can't easily use the slider to set things here */ *min = MINAFRAMEF; @@ -638,11 +638,11 @@ static void rna_FModifierLimits_maxx_range(PointerRNA *ptr, float *min, float *m *max = MAXFRAMEF; } -static void rna_FModifierLimits_miny_range(PointerRNA *ptr, float *min, float *max, - float *softmin, float *softmax) +static void rna_FModifierLimits_miny_range(PointerRNA *UNUSED(ptr), float *min, float *max, + float *UNUSED(softmin), float *UNUSED(softmax)) { - FModifier *fcm = (FModifier *)ptr->data; - FMod_Limits *data = fcm->data; + // FModifier *fcm = (FModifier *)ptr->data; + // FMod_Limits *data = fcm->data; /* no soft-limits on lower bound - it's too confusing when you can't easily use the slider to set things here */ *min = -FLT_MAX;