diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 14:04:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 14:04:16 +0300 |
| commit | 508e34d0bf68c837c3b0ece72faaab809df52506 (patch) | |
| tree | aeeafa9c1b853dacd38056bb5bf825c04863b481 /source/blender/editors/object/object_constraint.c | |
| parent | 4e014727f6ed1652fd922ba25ec00b0f9df694f9 (diff) | |
| parent | b3a7a75a266de6765d8c04953c0dabce3c30c359 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/animation/anim_deps.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/gpencil/gpencil_convert.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/interface/interface_anim.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_pose.c
source/blender/python/intern/bpy_rna_anim.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
Diffstat (limited to 'source/blender/editors/object/object_constraint.c')
| -rw-r--r-- | source/blender/editors/object/object_constraint.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 3f43f3c0407..3b5a8d190ff 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -969,6 +969,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; @@ -993,7 +994,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 */ @@ -1018,7 +1019,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 */ |