Revision: 32669
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32669
Author: campbellbarton
Date: 2010-10-23 18:03:31 +0200 (Sat, 23 Oct 2010)
Log Message:
-----------
warning fixes.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/space_script/script_edit.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/modifiers/CMakeLists.txt
trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c 2010-10-23
15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c 2010-10-23
16:03:31 UTC (rev 32669)
@@ -2015,6 +2015,7 @@
static void pycon_evaluate (bConstraint *con, bConstraintOb *cob, ListBase
*targets)
{
#ifdef DISABLE_PYTHON
+ (void)con; (void)cob; (void)targets; /* unused */
return;
#else
bPythonConstraint *data= con->data;
Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c
2010-10-23 15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/editors/object/object_constraint.c
2010-10-23 16:03:31 UTC (rev 32669)
@@ -200,7 +200,10 @@
/* 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)
Modified: trunk/blender/source/blender/editors/space_script/script_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/script_edit.c
2010-10-23 15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/editors/space_script/script_edit.c
2010-10-23 16:03:31 UTC (rev 32669)
@@ -60,6 +60,8 @@
ED_region_tag_redraw(ar);
return OPERATOR_FINISHED;
}
+#else
+ (void)C; /* unused */
#endif
return OPERATOR_CANCELLED; /* FAIL */
}
@@ -89,6 +91,8 @@
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;
}
Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c 2010-10-23
15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c 2010-10-23
16:03:31 UTC (rev 32669)
@@ -558,6 +558,8 @@
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;
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2010-10-23 15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2010-10-23 16:03:31 UTC (rev 32669)
@@ -1459,7 +1459,7 @@
{
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;
Modified: trunk/blender/source/blender/modifiers/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/modifiers/CMakeLists.txt 2010-10-23
15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/modifiers/CMakeLists.txt 2010-10-23
16:03:31 UTC (rev 32669)
@@ -85,7 +85,7 @@
IF(WITH_MOD_DECIMATE)
ADD_DEFINITIONS(-DWITH_MOD_DECIMATE)
LIST(APPEND INC ../../../intern/decimation/extern)
-ENDIF(WITH_MOD_BOOLEAN)
+ENDIF(WITH_MOD_DECIMATE)
IF(NOT WITH_MOD_FLUID)
ADD_DEFINITIONS(-DDISABLE_ELBEEM)
Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
2010-10-23 15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
2010-10-23 16:03:31 UTC (rev 32669)
@@ -533,7 +533,11 @@
r = RE_rayobject_align( r );
return r->api->cost( r );
}
- else assert(0);
+ else
+ {
+ assert(0);
+ return 1.0; /* XXX, better default value? */
+ }
}
void RE_rayobject_hint_bb(RayObject *r, RayHint *hint, float *min, float *max)
Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
2010-10-23 15:40:13 UTC (rev 32668)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
2010-10-23 16:03:31 UTC (rev 32669)
@@ -145,6 +145,9 @@
BPY_set_context(C); /* necessary evil */
BPY_start_python(argc, argv);
BPY_load_user_modules(C);
+#else
+ (void)argc; /* unused */
+ (void)argv; /* unused */
#endif
wm_init_reports(C); /* reports cant be initialized before the wm */
@@ -212,7 +215,7 @@
wmWindow* win;
ScrArea *sa;
- ARegion *ar;
+ ARegion *ar= NULL;
Scene *scene= CTX_data_scene(C);
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2010-10-23 15:40:13 UTC (rev
32668)
+++ trunk/blender/source/creator/creator.c 2010-10-23 16:03:31 UTC (rev
32669)
@@ -853,6 +853,7 @@
return 0;
}
#else
+ (void)argc; (void)argv; (void)data; /* unused */
printf("This blender was built without python support\n");
return 0;
#endif /* DISABLE_PYTHON */
@@ -868,6 +869,7 @@
return 0;
#else
+ (void)argv; (void)data; /* unused */
printf("This blender was built without python support\n");
return 0;
#endif /* DISABLE_PYTHON */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
