diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-10-12 20:48:12 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-10-12 20:48:12 +0300 |
| commit | dba7312f5eaa05ebc1e15332e41b369993361915 (patch) | |
| tree | c542fa1052257be281757f03473f0aa27f2b3f21 | |
| parent | c7bbcfe95444e730eacf655fd982f5091d5e2ff6 (diff) | |
Rename: multi_changed > changed_multi
We are using changed_multi plenty more than multi_changed. May as well keep it
consistent across the code.
| -rw-r--r-- | source/blender/editors/armature/armature_add.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/armature/armature_naming.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index ee9ef9debaf..5ed3fb67ec2 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -869,7 +869,7 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) { ViewLayer *view_layer = CTX_data_view_layer(C); const bool forked = RNA_boolean_get(op->ptr, "forked"); - bool multi_changed = false; + bool changed_multi = false; uint objects_len = 0; Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len); @@ -1019,7 +1019,7 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) continue; } - multi_changed = true; + changed_multi = true; /* Transform the endpoints */ ED_armature_edit_sync_selection(arm->edbo); @@ -1028,7 +1028,7 @@ static int armature_extrude_exec(bContext *C, wmOperator *op) } MEM_freeN(objects); - return multi_changed ? OPERATOR_FINISHED : OPERATOR_CANCELLED; + return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } void ARMATURE_OT_extrude(wmOperatorType *ot) diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index 15247399401..3d5ed47655c 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -487,7 +487,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); char newname[MAXBONENAME]; const short axis = RNA_enum_get(op->ptr, "type"); - bool multi_changed = false; + bool changed_multi = false; uint objects_len = 0; Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data(view_layer, &objects_len); @@ -529,7 +529,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op) continue; } - multi_changed = true; + changed_multi = true; /* Since we renamed stuff... */ DEG_id_tag_update(&ob->id, OB_RECALC_DATA); @@ -538,7 +538,7 @@ static int armature_autoside_names_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_OBJECT | ND_POSE, ob); } MEM_freeN(objects); - return multi_changed ? OPERATOR_FINISHED : OPERATOR_CANCELLED; + return changed_multi ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } void ARMATURE_OT_autoside_names(wmOperatorType *ot) |