archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

code cleanup: remove unused arg

Browse Source
This commit is contained in:
Campbell Barton
2013-02-22 00:51:58 +00:00
parent 51f22e639e
commit 2c084e280d
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/include/ED_object.h
View File

@@ -161,7 +161,7 @@ void object_test_constraints(struct Object *ob);
void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con); void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con);
void ED_object_constraint_update(struct Object *ob); void ED_object_constraint_update(struct Object *ob);
void ED_object_constraint_dependency_update(struct Main *bmain, struct Scene *scene, struct Object *ob); void ED_object_constraint_dependency_update(struct Main *bmain, struct Object *ob);
/* object_lattice.c */ /* object_lattice.c */
int mouse_lattice(struct bContext *C, const int mval[2], int extend, int deselect, int toggle); int mouse_lattice(struct bContext *C, const int mval[2], int extend, int deselect, int toggle);
@@ -179,9 +179,9 @@ enum {
struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene,
struct Object *ob, const char *name, int type); struct Object *ob, const char *name, int type);
int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, struct Scene *scene, int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain,
struct Object *ob, struct ModifierData *md); struct Object *ob, struct ModifierData *md);
void ED_object_modifier_clear(struct Main *bmain, struct Scene *scene, struct Object *ob); void ED_object_modifier_clear(struct Main *bmain, struct Object *ob);
int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md); int ED_object_modifier_move_down(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md); int ED_object_modifier_move_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md);
int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, struct Scene *scene, int ED_object_modifier_convert(struct ReportList *reports, struct Main *bmain, struct Scene *scene,

2
source/blender/editors/object/object_constraint.c
View File

@@ -1146,7 +1146,7 @@ void ED_object_constraint_update(Object *ob)
DAG_id_tag_update(&ob->id, OB_RECALC_OB); DAG_id_tag_update(&ob->id, OB_RECALC_OB);
} }
void ED_object_constraint_dependency_update(Main *bmain, Scene *scene, Object *ob) void ED_object_constraint_dependency_update(Main *bmain, Object *ob)
{ {
ED_object_constraint_update(ob); ED_object_constraint_update(ob);

6
source/blender/editors/object/object_modifier.c
View File

@@ -330,7 +330,7 @@ static int object_modifier_remove(Main *bmain, Object *ob, ModifierData *md,
return 1; return 1;
} }
int ED_object_modifier_remove(ReportList *reports, Main *bmain, Scene *scene, Object *ob, ModifierData *md) int ED_object_modifier_remove(ReportList *reports, Main *bmain, Object *ob, ModifierData *md)
{ {
int sort_depsgraph = 0; int sort_depsgraph = 0;
int ok; int ok;
@@ -348,7 +348,7 @@ int ED_object_modifier_remove(ReportList *reports, Main *bmain, Scene *scene, Ob
return 1; return 1;
} }
void ED_object_modifier_clear(Main *bmain, Scene *scene, Object *ob) void ED_object_modifier_clear(Main *bmain, Object *ob)
{ {
ModifierData *md = ob->modifiers.first; ModifierData *md = ob->modifiers.first;
int sort_depsgraph = 0; int sort_depsgraph = 0;
@@ -878,7 +878,7 @@ static int modifier_remove_exec(bContext *C, wmOperator *op)
ModifierData *md = edit_modifier_property_get(op, ob, 0); ModifierData *md = edit_modifier_property_get(op, ob, 0);
int mode_orig = ob ? ob->mode : 0; int mode_orig = ob ? ob->mode : 0;
if (!ob || !md || !ED_object_modifier_remove(op->reports, bmain, scene, ob, md)) if (!ob || !md || !ED_object_modifier_remove(op->reports, bmain, ob, md))
return OPERATOR_CANCELLED; return OPERATOR_CANCELLED;
WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob); WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob);

2
source/blender/editors/screen/area.c
View File

@@ -446,7 +446,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
UI_ThemeColor(TH_TEXT); UI_ThemeColor(TH_TEXT);
BLF_draw_default(UI_UNIT_X, 0.4f*UI_UNIT_Y, 0.0f, ar->headerstr, BLF_DRAW_STR_DUMMY_MAX); BLF_draw_default(UI_UNIT_X, 0.4f * UI_UNIT_Y, 0.0f, ar->headerstr, BLF_DRAW_STR_DUMMY_MAX);
} }
else if (at->draw) { else if (at->draw) {
at->draw(C, ar); at->draw(C, ar);

4
source/blender/makesrna/intern/rna_constraint.c
View File

@@ -244,9 +244,9 @@ static void rna_Constraint_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poi
ED_object_constraint_update(ptr->id.data); ED_object_constraint_update(ptr->id.data);
} }
static void rna_Constraint_dependency_update(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_Constraint_dependency_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{ {
ED_object_constraint_dependency_update(bmain, scene, ptr->id.data); ED_object_constraint_dependency_update(bmain, ptr->id.data);
} }
static void rna_Constraint_influence_update(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_Constraint_influence_update(Main *bmain, Scene *scene, PointerRNA *ptr)

4
source/blender/makesrna/intern/rna_object.c
View File

@@ -1311,7 +1311,7 @@ static ModifierData *rna_Object_modifier_new(Object *object, bContext *C, Report
static void rna_Object_modifier_remove(Object *object, bContext *C, ReportList *reports, PointerRNA *md_ptr) static void rna_Object_modifier_remove(Object *object, bContext *C, ReportList *reports, PointerRNA *md_ptr)
{ {
ModifierData *md = md_ptr->data; ModifierData *md = md_ptr->data;
if (ED_object_modifier_remove(reports, CTX_data_main(C), CTX_data_scene(C), object, md) == FALSE) { if (ED_object_modifier_remove(reports, CTX_data_main(C), object, md) == FALSE) {
/* error is already set */ /* error is already set */
return; return;
} }
@@ -1323,7 +1323,7 @@ static void rna_Object_modifier_remove(Object *object, bContext *C, ReportList *
static void rna_Object_modifier_clear(Object *object, bContext *C) static void rna_Object_modifier_clear(Object *object, bContext *C)
{ {
ED_object_modifier_clear(CTX_data_main(C), CTX_data_scene(C), object); ED_object_modifier_clear(CTX_data_main(C), object);
WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object); WM_main_add_notifier(NC_OBJECT | ND_MODIFIER | NA_REMOVED, object);
} }

4
source/blender/makesrna/intern/rna_object_force.c
View File

@@ -521,7 +521,7 @@ static void rna_FieldSettings_shape_update(Main *bmain, Scene *scene, PointerRNA
} }
else { else {
if (!pd || pd->shape != PFIELD_SHAPE_SURFACE) if (!pd || pd->shape != PFIELD_SHAPE_SURFACE)
ED_object_modifier_remove(NULL, bmain, scene, ob, md); ED_object_modifier_remove(NULL, bmain, ob, md);
} }
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob); WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
@@ -669,7 +669,7 @@ static void rna_CollisionSettings_dependency_update(Main *bmain, Scene *scene, P
if (ob->pd->deflect && !md) if (ob->pd->deflect && !md)
ED_object_modifier_add(NULL, bmain, scene, ob, NULL, eModifierType_Collision); ED_object_modifier_add(NULL, bmain, scene, ob, NULL, eModifierType_Collision);
else if (!ob->pd->deflect && md) else if (!ob->pd->deflect && md)
ED_object_modifier_remove(NULL, bmain, scene, ob, md); ED_object_modifier_remove(NULL, bmain, ob, md);
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob); WM_main_add_notifier(NC_OBJECT | ND_DRAW, ob);
} }

2
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@@ -321,7 +321,7 @@ void ED_screen_animation_playing(struct wmWindowManager *wm) {}
void ED_base_object_select(struct Base *base, short mode) {} void ED_base_object_select(struct Base *base, short mode) {}
int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md) {return 0;} int ED_object_modifier_remove(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md) {return 0;}
int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, char *name, int type) {return 0;} int ED_object_modifier_add(struct ReportList *reports, struct Scene *scene, struct Object *ob, char *name, int type) {return 0;}
void ED_object_modifier_clear(struct Scene *scene, struct Object *ob) {} void ED_object_modifier_clear(struct Main *bmain, struct Object *ob) {}
void ED_object_enter_editmode(struct bContext *C, int flag) {} void ED_object_enter_editmode(struct bContext *C, int flag) {}
void ED_object_exit_editmode(struct bContext *C, int flag) {} void ED_object_exit_editmode(struct bContext *C, int flag) {}
int uiLayoutGetActive(struct uiLayout *layout) {return 0;} int uiLayoutGetActive(struct uiLayout *layout) {return 0;}