From 54f9cd52835bdd96cdd01cf643cfccf8a229c04b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 6 Jun 2018 15:50:24 +0200 Subject: Cleanup: Nuke moar G.main usages... --- source/blender/editors/armature/armature_edit.c | 13 +++++++------ source/blender/editors/armature/armature_relations.c | 12 ++++++------ source/blender/editors/armature/armature_utils.c | 4 ++-- source/blender/editors/armature/editarmature_retarget.c | 7 +++++-- source/blender/editors/armature/pose_transform.c | 3 ++- 5 files changed, 22 insertions(+), 17 deletions(-) (limited to 'source/blender/editors/armature') diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index 539d56a4ede..0f382f07671 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -49,6 +49,7 @@ #include "BKE_constraint.h" #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_main.h" #include "BKE_report.h" #include "RNA_access.h" @@ -66,7 +67,7 @@ /* ************************** Object Tools Exports ******************************* */ /* NOTE: these functions are exported to the Object module to be called from the tools there */ -void ED_armature_transform_apply(Object *ob, float mat[4][4], const bool do_props) +void ED_armature_transform_apply(Main *bmain, Object *ob, float mat[4][4], const bool do_props) { bArmature *arm = ob->data; @@ -77,7 +78,7 @@ void ED_armature_transform_apply(Object *ob, float mat[4][4], const bool do_prop ED_armature_transform_bones(arm, mat, do_props); /* Turn the list into an armature */ - ED_armature_from_edit(arm); + ED_armature_from_edit(bmain, arm); ED_armature_edit_free(arm); } @@ -118,7 +119,7 @@ void ED_armature_transform_bones(struct bArmature *arm, float mat[4][4], const b } } -void ED_armature_transform(struct bArmature *arm, float mat[4][4], const bool do_props) +void ED_armature_transform(Main *bmain, bArmature *arm, float mat[4][4], const bool do_props) { if (arm->edbo) { ED_armature_transform_bones(arm, mat, do_props); @@ -131,14 +132,14 @@ void ED_armature_transform(struct bArmature *arm, float mat[4][4], const bool do ED_armature_transform_bones(arm, mat, do_props); /* Go back to object mode*/ - ED_armature_from_edit(arm); + ED_armature_from_edit(bmain, arm); ED_armature_edit_free(arm); } } /* exported for use in editors/object/ */ /* 0 == do center, 1 == center new, 2 == center cursor */ -void ED_armature_origin_set(Scene *scene, Object *ob, float cursor[3], int centermode, int around) +void ED_armature_origin_set(Main *bmain, Scene *scene, Object *ob, float cursor[3], int centermode, int around) { Object *obedit = scene->obedit; // XXX get from context EditBone *ebone; @@ -189,7 +190,7 @@ void ED_armature_origin_set(Scene *scene, Object *ob, float cursor[3], int cente /* Turn the list into an armature */ if (obedit == NULL) { - ED_armature_from_edit(arm); + ED_armature_from_edit(bmain, arm); ED_armature_edit_free(arm); } diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 95c8b1d5460..c9fe6a5758b 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -397,7 +397,7 @@ int join_armature_exec(bContext *C, wmOperator *op) DAG_relations_tag_update(bmain); /* because we removed object(s) */ - ED_armature_from_edit(arm); + ED_armature_from_edit(bmain, arm); ED_armature_edit_free(arm); WM_event_add_notifier(C, NC_SCENE | ND_OB_ACTIVE, scene); @@ -513,7 +513,7 @@ static void separated_armature_fix_links(Object *origArm, Object *newArm) * sel: remove selected bones from the armature, otherwise the unselected bones are removed * (ob is not in editmode) */ -static void separate_armature_bones(Object *ob, short sel) +static void separate_armature_bones(Main *bmain, Object *ob, short sel) { bArmature *arm = (bArmature *)ob->data; bPoseChannel *pchan, *pchann; @@ -560,7 +560,7 @@ static void separate_armature_bones(Object *ob, short sel) } /* exit editmode (recalculates pchans too) */ - ED_armature_from_edit(ob->data); + ED_armature_from_edit(bmain, ob->data); ED_armature_edit_free(ob->data); } @@ -603,7 +603,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op) oldob->mode &= ~OB_MODE_POSE; //oldbase->flag &= ~OB_POSEMODE; - ED_armature_from_edit(obedit->data); + ED_armature_from_edit(bmain, obedit->data); ED_armature_edit_free(obedit->data); /* 2) duplicate base */ @@ -615,8 +615,8 @@ static int separate_armature_exec(bContext *C, wmOperator *op) /* 3) remove bones that shouldn't still be around on both armatures */ - separate_armature_bones(oldob, 1); - separate_armature_bones(newob, 0); + separate_armature_bones(bmain, oldob, 1); + separate_armature_bones(bmain, newob, 0); /* 4) fix links before depsgraph flushes */ // err... or after? diff --git a/source/blender/editors/armature/armature_utils.c b/source/blender/editors/armature/armature_utils.c index f0e4d5e1102..c6cd9475008 100644 --- a/source/blender/editors/armature/armature_utils.c +++ b/source/blender/editors/armature/armature_utils.c @@ -584,7 +584,7 @@ static void armature_finalize_restpose(ListBase *bonelist, ListBase *editbonelis } /* put EditMode back in Object */ -void ED_armature_from_edit(bArmature *arm) +void ED_armature_from_edit(Main *bmain, bArmature *arm) { EditBone *eBone, *neBone; Bone *newBone; @@ -678,7 +678,7 @@ void ED_armature_from_edit(bArmature *arm) armature_finalize_restpose(&arm->bonebase, arm->edbo); /* so all users of this armature should get rebuilt */ - for (obt = G.main->object.first; obt; obt = obt->id.next) { + for (obt = bmain->object.first; obt; obt = obt->id.next) { if (obt->data == arm) { BKE_pose_rebuild(obt, arm); } diff --git a/source/blender/editors/armature/editarmature_retarget.c b/source/blender/editors/armature/editarmature_retarget.c index ad0025955c2..b74b515b37f 100644 --- a/source/blender/editors/armature/editarmature_retarget.c +++ b/source/blender/editors/armature/editarmature_retarget.c @@ -40,6 +40,7 @@ #include "BKE_constraint.h" #include "BKE_armature.h" #include "BKE_context.h" +#include "BKE_main.h" #include "ED_armature.h" #include "ED_undo.h" @@ -2413,6 +2414,7 @@ static void finishRetarget(RigGraph *rigg) static void adjustGraphs(bContext *C, RigGraph *rigg) { + Main *bmain = CTX_data_main(C); bArmature *arm = rigg->ob->data; RigArc *arc; @@ -2426,13 +2428,14 @@ static void adjustGraphs(bContext *C, RigGraph *rigg) /* Turn the list into an armature */ arm->edbo = rigg->editbones; - ED_armature_from_edit(arm); + ED_armature_from_edit(bmain, arm); ED_undo_push(C, "Retarget Skeleton"); } static void retargetGraphs(bContext *C, RigGraph *rigg) { + Main *bmain = CTX_data_main(C); bArmature *arm = rigg->ob->data; ReebGraph *reebg = rigg->link_mesh; RigNode *inode; @@ -2453,7 +2456,7 @@ static void retargetGraphs(bContext *C, RigGraph *rigg) /* Turn the list into an armature */ arm->edbo = rigg->editbones; - ED_armature_from_edit(arm); + ED_armature_from_edit(bmain, arm); } const char *RIG_nameBone(RigGraph *rg, int arc_index, int bone_index) diff --git a/source/blender/editors/armature/pose_transform.c b/source/blender/editors/armature/pose_transform.c index 1fc623eb6af..c726b4db7bf 100644 --- a/source/blender/editors/armature/pose_transform.c +++ b/source/blender/editors/armature/pose_transform.c @@ -92,6 +92,7 @@ static void applyarmature_fix_boneparents(Scene *scene, Object *armob) /* set the current pose as the restpose */ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op) { + Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); // must be active object, not edit-object bArmature *arm = BKE_armature_from_object(ob); @@ -185,7 +186,7 @@ static int apply_armature_pose2bones_exec(bContext *C, wmOperator *op) } /* convert editbones back to bones, and then free the edit-data */ - ED_armature_from_edit(arm); + ED_armature_from_edit(bmain, arm); ED_armature_edit_free(arm); /* flush positions of posebones */ -- cgit v1.2.3