From 2d9be2226a7b8ec35f3055743f3d6e381fe78757 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Oct 2010 16:03:31 +0000 Subject: warning fixes. --- source/blender/editors/object/object_constraint.c | 5 ++++- source/blender/editors/space_script/script_edit.c | 4 ++++ source/blender/editors/space_text/text_ops.c | 2 ++ source/blender/editors/space_view3d/view3d_draw.c | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 02c88d4149b..09760a8f51b 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -200,7 +200,10 @@ char *buildmenu_pyconstraints (Text *con_text, int *pyconindex) /* this callback gets called when the 'refresh' button of a pyconstraint gets pressed */ void update_pyconstraint_cb (void *arg1, void *arg2) { -#ifndef DISABLE_PYTHON +#ifdef DISABLE_PYTHON + (void)arg1; /* unused */ + (void)arg2; /* unused */ +#else Object *owner= (Object *)arg1; bConstraint *con= (bConstraint *)arg2; if (owner && con) diff --git a/source/blender/editors/space_script/script_edit.c b/source/blender/editors/space_script/script_edit.c index 7e3b14ca04a..23bc385c758 100644 --- a/source/blender/editors/space_script/script_edit.c +++ b/source/blender/editors/space_script/script_edit.c @@ -60,6 +60,8 @@ static int run_pyfile_exec(bContext *C, wmOperator *op) ED_region_tag_redraw(ar); return OPERATOR_FINISHED; } +#else + (void)C; /* unused */ #endif return OPERATOR_CANCELLED; /* FAIL */ } @@ -89,6 +91,8 @@ static int script_reload_exec(bContext *C, wmOperator *UNUSED(op)) BPY_eval_string(C, "__import__('bpy').utils.load_scripts(reload_scripts=True)"); WM_cursor_wait(0); return OPERATOR_FINISHED; +#else + (void)C; /* unused */ #endif return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 8d4f3f87f66..af29e575482 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -558,6 +558,8 @@ static int run_script_poll(bContext *C) static int run_script_exec(bContext *C, wmOperator *op) { #ifdef DISABLE_PYTHON + (void)C; /* unused */ + BKE_report(op->reports, RPT_ERROR, "Python disabled in this build"); return OPERATOR_CANCELLED; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 7722ca5605b..30880db0c90 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1459,7 +1459,7 @@ static void draw_dupli_objects_color(Scene *scene, ARegion *ar, View3D *v3d, Bas { RegionView3D *rv3d= ar->regiondata; ListBase *lb; - DupliObject *dob_prev= NULL, *dob, *dob_next; + DupliObject *dob_prev= NULL, *dob, *dob_next= NULL; Base tbase; BoundBox bb, *bb_tmp; /* use a copy because draw_object, calls clear_mesh_caches */ GLuint displist=0; -- cgit v1.2.3