forked from bartvdbraak/blender
warning fixes.
This commit is contained in:
parent
05b297c52f
commit
2d9be2226a
@ -2015,6 +2015,7 @@ static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintT
|
||||
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;
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -85,7 +85,7 @@ ENDIF(WITH_MOD_BOOLEAN)
|
||||
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)
|
||||
|
@ -533,7 +533,11 @@ float RE_rayobject_cost(RayObject *r)
|
||||
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)
|
||||
|
@ -145,6 +145,9 @@ void WM_init(bContext *C, int argc, char **argv)
|
||||
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 @@ int WM_init_game(bContext *C)
|
||||
wmWindow* win;
|
||||
|
||||
ScrArea *sa;
|
||||
ARegion *ar;
|
||||
ARegion *ar= NULL;
|
||||
|
||||
Scene *scene= CTX_data_scene(C);
|
||||
|
||||
|
@ -853,6 +853,7 @@ static int run_python(int argc, char **argv, void *data)
|
||||
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 @@ static int run_python_console(int UNUSED(argc), char **argv, void *data)
|
||||
|
||||
return 0;
|
||||
#else
|
||||
(void)argv; (void)data; /* unused */
|
||||
printf("This blender was built without python support\n");
|
||||
return 0;
|
||||
#endif /* DISABLE_PYTHON */
|
||||
|
Loading…
Reference in New Issue
Block a user