diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/include/ED_object.h | 12 | ||||
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 36 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 21 | ||||
-rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
5 files changed, 37 insertions, 36 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 973023227f0..dae53213afb 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -187,8 +187,8 @@ enum { struct ModifierData *ED_object_modifier_add(struct ReportList *reports, struct Main *bmain, struct Scene *scene, struct Object *ob, const char *name, int type); -int ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, - struct Object *ob, struct ModifierData *md); +bool ED_object_modifier_remove(struct ReportList *reports, struct Main *bmain, + struct Object *ob, struct ModifierData *md); 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_up(struct ReportList *reports, struct Object *ob, struct ModifierData *md); @@ -198,11 +198,11 @@ int ED_object_modifier_apply(struct ReportList *reports, struct Scene *scene, struct Object *ob, struct ModifierData *md, int mode); int ED_object_modifier_copy(struct ReportList *reports, struct Object *ob, struct ModifierData *md); -int ED_object_iter_other(struct Main *bmain, struct Object *orig_ob, const bool include_orig, - int (*callback)(struct Object *ob, void *callback_data), - void *callback_data); +bool ED_object_iter_other(struct Main *bmain, struct Object *orig_ob, const bool include_orig, + bool (*callback)(struct Object *ob, void *callback_data), + void *callback_data); -int ED_object_multires_update_totlevels_cb(struct Object *ob, void *totlevel_v); +bool ED_object_multires_update_totlevels_cb(struct Object *ob, void *totlevel_v); /* object_select.c */ void ED_object_select_linked_by_id(struct bContext *C, struct ID *id); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 92775b250b1..50d708bb49e 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -177,8 +177,8 @@ ModifierData *ED_object_modifier_add(ReportList *reports, Main *bmain, Scene *sc /* Return TRUE if the object has a modifier of type 'type' other than * the modifier pointed to be 'exclude', otherwise returns FALSE. */ -static int object_has_modifier(const Object *ob, const ModifierData *exclude, - ModifierType type) +static bool object_has_modifier(const Object *ob, const ModifierData *exclude, + ModifierType type) { ModifierData *md; @@ -198,9 +198,9 @@ static int object_has_modifier(const Object *ob, const ModifierData *exclude, * If the callback ever returns TRUE, iteration will stop and the * function value will be TRUE. Otherwise the function returns FALSE. */ -int ED_object_iter_other(Main *bmain, Object *orig_ob, const bool include_orig, - int (*callback)(Object *ob, void *callback_data), - void *callback_data) +bool ED_object_iter_other(Main *bmain, Object *orig_ob, const bool include_orig, + bool (*callback)(Object *ob, void *callback_data), + void *callback_data) { ID *ob_data_id = orig_ob->data; int users = ob_data_id->us; @@ -233,7 +233,7 @@ int ED_object_iter_other(Main *bmain, Object *orig_ob, const bool include_orig, return FALSE; } -static int object_has_modifier_cb(Object *ob, void *data) +static bool object_has_modifier_cb(Object *ob, void *data) { ModifierType type = *((ModifierType *)data); @@ -243,7 +243,7 @@ static int object_has_modifier_cb(Object *ob, void *data) /* Use with ED_object_iter_other(). Sets the total number of levels * for any multires modifiers on the object to the int pointed to by * callback_data. */ -int ED_object_multires_update_totlevels_cb(Object *ob, void *totlevel_v) +bool ED_object_multires_update_totlevels_cb(Object *ob, void *totlevel_v) { ModifierData *md; int totlevel = *((int *)totlevel_v); @@ -258,17 +258,17 @@ int ED_object_multires_update_totlevels_cb(Object *ob, void *totlevel_v) } /* Return TRUE if no modifier of type 'type' other than 'exclude' */ -static int object_modifier_safe_to_delete(Main *bmain, Object *ob, - ModifierData *exclude, - ModifierType type) +static bool object_modifier_safe_to_delete(Main *bmain, Object *ob, + ModifierData *exclude, + ModifierType type) { return (!object_has_modifier(ob, exclude, type) && !ED_object_iter_other(bmain, ob, FALSE, object_has_modifier_cb, &type)); } -static int object_modifier_remove(Main *bmain, Object *ob, ModifierData *md, - int *sort_depsgraph) +static bool object_modifier_remove(Main *bmain, Object *ob, ModifierData *md, + bool *r_sort_depsgraph) { /* It seems on rapid delete it is possible to * get called twice on same modifier, so make @@ -296,10 +296,10 @@ static int object_modifier_remove(Main *bmain, Object *ob, ModifierData *md, if (ob->pd) ob->pd->deflect = 0; - *sort_depsgraph = 1; + *r_sort_depsgraph = true; } else if (md->type == eModifierType_Surface) { - *sort_depsgraph = 1; + *r_sort_depsgraph = true; } else if (md->type == eModifierType_Multires) { /* Delete MDisps layer if not used by another multires modifier */ @@ -324,10 +324,10 @@ static int object_modifier_remove(Main *bmain, Object *ob, ModifierData *md, return 1; } -int ED_object_modifier_remove(ReportList *reports, Main *bmain, Object *ob, ModifierData *md) +bool ED_object_modifier_remove(ReportList *reports, Main *bmain, Object *ob, ModifierData *md) { - int sort_depsgraph = 0; - int ok; + bool sort_depsgraph = false; + bool ok; ok = object_modifier_remove(bmain, ob, md, &sort_depsgraph); @@ -345,7 +345,7 @@ int ED_object_modifier_remove(ReportList *reports, Main *bmain, Object *ob, Modi void ED_object_modifier_clear(Main *bmain, Object *ob) { ModifierData *md = ob->modifiers.first; - int sort_depsgraph = 0; + bool sort_depsgraph = false; if (!md) return; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index a14a4213d92..66884d75f36 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1251,16 +1251,17 @@ void ED_vgroup_vert_add(Object *ob, bDeformGroup *dg, int vertnum, float weight, /* get the deform group number, exit if * it can't be found */ - if (def_nr < 0) return; + if (def_nr != -1) { - /* if there's no deform verts then create some, - */ - if (ED_vgroup_array_get(ob->data, &dv, &tot) && dv == NULL) - ED_vgroup_data_create(ob->data); + /* if there's no deform verts then create some, + */ + if (ED_vgroup_array_get(ob->data, &dv, &tot) && dv == NULL) + ED_vgroup_data_create(ob->data); - /* call another function to do the work - */ - ED_vgroup_nr_vert_add(ob, def_nr, vertnum, weight, assignmode); + /* call another function to do the work + */ + ED_vgroup_nr_vert_add(ob, def_nr, vertnum, weight, assignmode); + } } /* mesh object mode, lattice can be in editmode */ @@ -2778,7 +2779,7 @@ static void vgroup_delete_object_mode(Object *ob, bDeformGroup *dg) int dvert_tot = 0; const int def_nr = BLI_findindex(&ob->defbase, dg); - assert(def_nr > -1); + BLI_assert(def_nr != -1); ED_vgroup_array_get(ob->data, &dvert_array, &dvert_tot); @@ -2908,7 +2909,7 @@ static void vgroup_delete_edit_mode(Object *ob, bDeformGroup *dg) int i; const int dg_index = BLI_findindex(&ob->defbase, dg); - assert(dg_index > -1); + BLI_assert(dg_index != -1); /* Make sure that no verts are using this group */ if (vgroup_active_remove_verts(ob, true, dg) == false) { diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 25b6f241d9b..3bec60008e6 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1557,7 +1557,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, const char * BLI_SMALLSTACK_DECLARE(pt_stack, PanelType *); - if (contextnr >= 0) + if (contextnr != -1) is_context_new = UI_view2d_tab_set(v2d, contextnr); /* before setting the view */ diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 9be83bffc5b..3163e8ffce4 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2232,7 +2232,7 @@ static void createTransEditVerts(TransInfo *t) } /* detect CrazySpace [tm] */ - if (modifiers_getCageIndex(t->scene, t->obedit, NULL, 1) >= 0) { + if (modifiers_getCageIndex(t->scene, t->obedit, NULL, 1) != -1) { int totleft = -1; if (modifiers_isCorrectableDeformed(t->scene, t->obedit)) { /* check if we can use deform matrices for modifier from the |