Commit: 05b5958a7a3bc112695bb9f63728260d595a51f4
Author: Gaia Clary
Date: Tue Feb 27 17:08:40 2018 +0100
Branches: master
https://developer.blender.org/rB05b5958a7a3bc112695bb9f63728260d595a51f4
Collada: Remove obsolete code
===================================================================
M source/blender/collada/AnimationExporter.cpp
M source/blender/collada/AnimationExporter.h
===================================================================
diff --git a/source/blender/collada/AnimationExporter.cpp
b/source/blender/collada/AnimationExporter.cpp
index cc9e7d2b088..97d3b6b29b8 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -1938,49 +1938,3 @@ bool AnimationExporter::validateConstraints(bConstraint
*con)
return valid;
}
-
-#if 0
-/*
- * Needed for sampled animations.
- * This function calculates the object matrix at a given time,
- * also taking constraints into account.
- *
- * XXX: Why looking at the constraints here is necessary?
- * Maybe this can be done better?
- */
-void AnimationExporter::calc_obmat_at_time(Object *ob, float ctime )
-{
- BKE_scene_frame_set(scene, ctime);
-
- Main *bmain = bc_get_main();
- EvaluationContext *ev_context = bc_get_evaluation_context();
- BKE_scene_update_for_newframe(ev_context, bmain, scene, scene->lay);
-
- ListBase *conlist = get_active_constraints(ob);
- bConstraint *con;
- for (con = (bConstraint *)conlist->first; con; con = con->next) {
- ListBase targets = {NULL, NULL};
-
- const bConstraintTypeInfo *cti =
BKE_constraint_typeinfo_get(con);
-
- if (cti && cti->get_constraint_targets) {
- bConstraintTarget *ct;
- Object *obtar;
- cti->get_constraint_targets(con, &targets);
- for (ct = (bConstraintTarget *)targets.first; ct; ct =
ct->next) {
- obtar = ct->tar;
-
- if (obtar) {
- BKE_animsys_evaluate_animdata(scene,
&obtar->id, obtar->adt, ctime, ADT_RECALC_ANIM);
- BKE_object_where_is_calc_time(scene,
obtar, ctime);
- }
- }
-
- if (cti->flush_constraint_targets)
- cti->flush_constraint_targets(con, &targets, 1);
- }
- }
- BKE_object_where_is_calc_time(scene, ob, ctime);
-}
-#endif
-
diff --git a/source/blender/collada/AnimationExporter.h
b/source/blender/collada/AnimationExporter.h
index 52b46353528..a739b2b6cbe 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -200,6 +200,5 @@ protected:
bool validateConstraints(bConstraint *con);
- //void calc_obmat_at_time(Object *ob, float ctime);
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
