blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Rename: multi_changed > changed_multi 

We are using changed_multi plenty more than multi_changed. May as well keep it
consistent across the code.
This commit is contained in:
Dalai Felinto 2018-10-12 14:48:12 -03:00
parent c7bbcfe954
commit dba7312f5e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/armature/armature_add.c
View File

@ -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)

6
source/blender/editors/armature/armature_naming.c
View File

@ -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)