diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 23:39:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 23:39:14 +0400 |
commit | 63caaa2b12edf0e0a47764156416fac9d43d3664 (patch) | |
tree | 39d9455df141edc2f232240da34514b0468dcc28 /source/blender/editors/physics | |
parent | 5928af11ef97d6d9318d3a06fe32f0d77fc48e9c (diff) |
Code Cleanup: rename vars for detecting change to be more consistent
rename change/is_change/is_changed/modified -> changed
also use bools over int/short/char and once accidental float.
Diffstat (limited to 'source/blender/editors/physics')
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 6 | ||||
-rw-r--r-- | source/blender/editors/physics/rigidbody_constraint.c | 6 | ||||
-rw-r--r-- | source/blender/editors/physics/rigidbody_object.c | 36 |
3 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 65a3e5b558e..808c7cc3e82 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -2978,7 +2978,7 @@ static void brush_puff(PEData *data, int point_index) float co_prev[3], co[3]; /* track key coords as we loop (global-space) */ float fac = 0.0f, length_accum = 0.0f; bool puff_volume = false; - bool change = false; + bool changed = false; zero_v3(ofs_prev); @@ -3056,7 +3056,7 @@ static void brush_puff(PEData *data, int point_index) * keys that come after */ sub_v3_v3v3(ofs_prev, key->co, dco); } - change = true; + changed = true; } else { @@ -3116,7 +3116,7 @@ static void brush_puff(PEData *data, int point_index) } } - if (change) + if (changed) point->flag |= PEP_EDIT_RECALC; } diff --git a/source/blender/editors/physics/rigidbody_constraint.c b/source/blender/editors/physics/rigidbody_constraint.c index 698d530c22d..00b9940121c 100644 --- a/source/blender/editors/physics/rigidbody_constraint.c +++ b/source/blender/editors/physics/rigidbody_constraint.c @@ -123,7 +123,7 @@ static int rigidbody_con_add_exec(bContext *C, wmOperator *op) RigidBodyWorld *rbw = BKE_rigidbody_get_world(scene); Object *ob = (scene) ? OBACT : NULL; int type = RNA_enum_get(op->ptr, "type"); - bool change; + bool changed; /* sanity checks */ if (ELEM(NULL, scene, rbw)) { @@ -131,9 +131,9 @@ static int rigidbody_con_add_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } /* apply to active object */ - change = ED_rigidbody_constraint_add(scene, ob, type, op->reports); + changed = ED_rigidbody_constraint_add(scene, ob, type, op->reports); - if (change) { + if (changed) { /* send updates */ WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); diff --git a/source/blender/editors/physics/rigidbody_object.c b/source/blender/editors/physics/rigidbody_object.c index 00304090818..ae6af7c2e0b 100644 --- a/source/blender/editors/physics/rigidbody_object.c +++ b/source/blender/editors/physics/rigidbody_object.c @@ -145,12 +145,12 @@ static int rigidbody_object_add_exec(bContext *C, wmOperator *op) Scene *scene = CTX_data_scene(C); Object *ob = ED_object_active_context(C); int type = RNA_enum_get(op->ptr, "type"); - bool change; + bool changed; /* apply to active object */ - change = ED_rigidbody_object_add(scene, ob, type, op->reports); + changed = ED_rigidbody_object_add(scene, ob, type, op->reports); - if (change) { + if (changed) { /* send updates */ WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL); @@ -187,15 +187,15 @@ static int rigidbody_object_remove_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); Object *ob = ED_object_active_context(C); - bool change = false; + bool changed = false; /* apply to active object */ if (!ELEM(NULL, ob, ob->rigidbody_object)) { ED_rigidbody_object_remove(scene, ob); - change = true; + changed = true; } - if (change) { + if (changed) { /* send updates */ WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL); @@ -233,15 +233,15 @@ static int rigidbody_objects_add_exec(bContext *C, wmOperator *op) { Scene *scene = CTX_data_scene(C); int type = RNA_enum_get(op->ptr, "type"); - bool change = false; + bool changed = false; /* create rigid body objects and add them to the world's group */ CTX_DATA_BEGIN(C, Object *, ob, selected_objects) { - change |= ED_rigidbody_object_add(scene, ob, type, op->reports); + changed |= ED_rigidbody_object_add(scene, ob, type, op->reports); } CTX_DATA_END; - if (change) { + if (changed) { /* send updates */ WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL); @@ -277,19 +277,19 @@ void RIGIDBODY_OT_objects_add(wmOperatorType *ot) static int rigidbody_objects_remove_exec(bContext *C, wmOperator *UNUSED(op)) { Scene *scene = CTX_data_scene(C); - bool change = false; + bool changed = false; /* apply this to all selected objects... */ CTX_DATA_BEGIN(C, Object *, ob, selected_objects) { if (ob->rigidbody_object) { ED_rigidbody_object_remove(scene, ob); - change = true; + changed = true; } } CTX_DATA_END; - if (change) { + if (changed) { /* send updates */ WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL); WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL); @@ -325,7 +325,7 @@ void RIGIDBODY_OT_objects_remove(wmOperatorType *ot) static int rigidbody_objects_shape_change_exec(bContext *C, wmOperator *op) { int shape = RNA_enum_get(op->ptr, "type"); - bool change = false; + bool changed = false; /* apply this to all selected objects... */ CTX_DATA_BEGIN(C, Object *, ob, selected_objects) @@ -339,12 +339,12 @@ static int rigidbody_objects_shape_change_exec(bContext *C, wmOperator *op) DAG_id_tag_update(&ob->id, OB_RECALC_OB); - change = true; + changed = true; } } CTX_DATA_END; - if (change) { + if (changed) { /* send updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL); @@ -555,7 +555,7 @@ static int rigidbody_objects_calc_mass_exec(bContext *C, wmOperator *op) { int material = RNA_enum_get(op->ptr, "material"); float density; - bool change = false; + bool changed = false; /* get density (kg/m^3) to apply */ if (material >= 0) { @@ -592,12 +592,12 @@ static int rigidbody_objects_calc_mass_exec(bContext *C, wmOperator *op) DAG_id_tag_update(&ob->id, OB_RECALC_OB); - change = true; + changed = true; } } CTX_DATA_END; - if (change) { + if (changed) { /* send updates */ WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL); |