[Bf-blender-cvs] [26fc197d499] blender2.8: Collada: commented out code was previously left over with an unresolved conflict in it. Deleting as its no longer needed

[Gaia Clary]

Commit: 26fc197d49909f76d9bef1adc9b2b2c92183af30
Author: Gaia Clary
Date:   Tue Feb 27 17:12:53 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB26fc197d49909f76d9bef1adc9b2b2c92183af30

Collada: commented out code was previously left over with an unresolved conflict in it. Deleting as its no longer needed

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

M	source/blender/collada/AnimationExporter.cpp

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

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index 4687af5a771..684575bfc08 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -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
-