Collada: commented out code was previously left over with an unresolved conflict...
[blender.git] / source / blender / collada / AnimationExporter.cpp
index 4687af5a7711624ae010a252af9561e533dbc258..684575bfc08cbb2e4269963af6d2138e01c66ab2 100644 (file)
@@ -1945,58 +1945,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 )
-{
-<<<<<<< HEAD
-       ListBase *conlist = get_active_constraints(this->eval_ctx, ob);
-=======
-       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);
->>>>>>> master
-       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(eval_ctx, scene, obtar, ctime);
-                               }
-                       }
-
-                       if (cti->flush_constraint_targets)
-                               cti->flush_constraint_targets(con, &targets, 1);
-               }
-       }
-<<<<<<< HEAD
-       BKE_object_where_is_calc_time(eval_ctx, scene, ob, ctime);
-       copy_m4_m4(mat, ob->obmat);
-=======
-       BKE_object_where_is_calc_time(scene, ob, ctime);
->>>>>>> master
-}
-#endif
-