[Bf-blender-cvs] [98dcd33238e] blender2.8: Fix Collada building after changes in API.

Bastien Montagne noreply at git.blender.org
Tue Feb 6 12:11:59 CET 2018


Commit: 98dcd33238e44984d31d96e2ffd0191a5d1cf7b6
Author: Bastien Montagne
Date:   Tue Feb 6 12:11:00 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB98dcd33238e44984d31d96e2ffd0191a5d1cf7b6

Fix Collada building after changes in API.

Seriously guys... *Full* build when you change APIs!

===================================================================

M	source/blender/collada/AnimationExporter.cpp

===================================================================

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 6e59a404e47..01f800b08e1 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -178,7 +178,7 @@ void AnimationExporter::export_morph_animation(Object *ob)
 
 void AnimationExporter::make_anim_frames_from_targets(Object *ob, std::vector<float> &frames )
 {
-	ListBase *conlist = get_active_constraints(ob);
+	ListBase *conlist = get_active_constraints(this->eval_ctx, ob);
 	if (conlist == NULL) return;
 	bConstraint *con;
 	for (con = (bConstraint *)conlist->first; con; con = con->next) {
@@ -1539,7 +1539,7 @@ bool AnimationExporter::validateConstraints(bConstraint *con)
 
 void AnimationExporter::calc_ob_mat_at_time(Object *ob, float ctime , float mat[][4])
 {
-	ListBase *conlist = get_active_constraints(ob);
+	ListBase *conlist = get_active_constraints(this->eval_ctx, ob);
 	bConstraint *con;
 	for (con = (bConstraint *)conlist->first; con; con = con->next) {
 		ListBase targets = {NULL, NULL};



More information about the Bf-blender-cvs mailing list