From b3a7a75a266de6765d8c04953c0dabce3c30c359 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 7 Jun 2018 12:47:00 +0200 Subject: Cleanup: remove moar G.main usages. Notes: * Really need to address RNA setters case, end up adding way too much G.main here these days... :/ * Added Main pointer into bAnimContext, helps a lot in anim code ;) --- source/blender/editors/object/object_constraint.c | 5 +++-- source/blender/editors/object/object_relations.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/object') diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index bb9d9d74bb4..1fc47905db0 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -960,6 +960,7 @@ void CONSTRAINT_OT_childof_clear_inverse(wmOperatorType *ot) static int followpath_path_animate_exec(bContext *C, wmOperator *op) { + Main *bmain = CTX_data_main(C); Object *ob = ED_object_active_context(C); bConstraint *con = edit_constraint_property_get(op, ob, CONSTRAINT_TYPE_FOLLOWPATH); bFollowPathConstraint *data = (con) ? (bFollowPathConstraint *)con->data : NULL; @@ -984,7 +985,7 @@ static int followpath_path_animate_exec(bContext *C, wmOperator *op) (list_find_fcurve(&cu->adt->action->curves, "eval_time", 0) == NULL)) { /* create F-Curve for path animation */ - act = verify_adt_action(&cu->id, 1); + act = verify_adt_action(bmain, &cu->id, 1); fcu = verify_fcurve(act, NULL, NULL, "eval_time", 0, 1); /* standard vertical range - 1:1 = 100 frames */ @@ -1009,7 +1010,7 @@ static int followpath_path_animate_exec(bContext *C, wmOperator *op) path = RNA_path_from_ID_to_property(&ptr, prop); /* create F-Curve for constraint */ - act = verify_adt_action(&ob->id, 1); + act = verify_adt_action(bmain, &ob->id, 1); fcu = verify_fcurve(act, NULL, NULL, path, 0, 1); /* standard vertical range - 0.0 to 1.0 */ diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 68bcdc59f4e..03ded0f71e5 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -633,7 +633,7 @@ bool ED_object_parent_set(ReportList *reports, Main *bmain, Scene *scene, Object /* if follow, add F-Curve for ctime (i.e. "eval_time") so that path-follow works */ if (partype == PAR_FOLLOW) { /* get or create F-Curve */ - bAction *act = verify_adt_action(&cu->id, 1); + bAction *act = verify_adt_action(bmain, &cu->id, 1); FCurve *fcu = verify_fcurve(act, NULL, NULL, "eval_time", 0, 1); /* setup dummy 'generator' modifier here to get 1-1 correspondence still working */ -- cgit v1.2.3