4 Devs in Agreement - End of the Road for Old Track

This commit removes the Old Track method (used to be found under Object -> Animation -> Track), with all existing instances of this being converted to Track To Constraints. In fact, while performing this removal, I found that this was supposed to have happened in version 2.27 already, but for some reason the options were left in, and this function managed to survive for a further decade.

I've left the tracking axes around still, since it seems some curve tools still use that. However, that usage should probably get faded out in future too?


Misc notes:
* Fixed compiling error with constaints from harkyman's Maintain Volume patch. 
* Subversion of 2.52 now bumped up to .2

2 files changed, 1 insertions, 27 deletions

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 921a56142d4..a2070771844 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -973,10 +973,6 @@ static void copy_object_set_idnew(bContext *C, int dupflag)
 {
 	Material *ma, *mao;
 	ID *id;
-#if 0 // XXX old animation system
-	Ipo *ipo;
-	bActionStrip *strip;
-#endif // XXX old animation system
 	int a;
 	
 	/* XXX check object pointers */
@@ -990,17 +986,8 @@ static void copy_object_set_idnew(bContext *C, int dupflag)
 		}
 		modifiers_foreachIDLink(ob, copy_object__forwardModifierLinks, NULL);
 		ID_NEW(ob->parent);
-		ID_NEW(ob->track);
 		ID_NEW(ob->proxy);
 		ID_NEW(ob->proxy_group);
-		
-#if 0 // XXX old animation system
-		for(strip= ob->nlastrips.first; strip; strip= strip->next) {
-			bActionModifier *amod;
-			for(amod= strip->modifiers.first; amod; amod= amod->next)
-				ID_NEW(amod->ob);
-		}
-#endif // XXX old animation system
 	}
 	CTX_DATA_END;
 	
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index e89bde00ce7..52d6a7a7b8b 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -405,7 +405,7 @@ void OBJECT_OT_proxy_make (wmOperatorType *ot)
 
 static EnumPropertyItem prop_clear_parent_types[] = {
 	{0, "CLEAR", 0, "Clear Parent", ""},
-	{1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation (Clear Track)", ""},
+	{1, "CLEAR_KEEP_TRANSFORM", 0, "Clear and Keep Transformation", ""},
 	{2, "CLEAR_INVERSE", 0, "Clear Parent Inverse", ""},
 	{0, NULL, 0, NULL, NULL}
 };
@@ -422,7 +422,6 @@ static int parent_clear_exec(bContext *C, wmOperator *op)
 		}			
 		else if(type == 1) {
 			ob->parent= NULL;
-			ob->track= NULL;
 			object_apply_mat4(ob, ob->obmat);
 		}
 		else if(type == 2)
@@ -916,7 +915,6 @@ static EnumPropertyItem prop_make_track_types[] = {
 	{1, "DAMPTRACK", 0, "Damped Track Constraint", ""},
 	{2, "TRACKTO", 0, "Track To Constraint", ""},
 	{3, "LOCKTRACK", 0, "Lock Track Constraint", ""},
-	{4, "OLDTRACK", 0, "Old Track", ""},
 	{0, NULL, 0, NULL, NULL}
 };
 
@@ -988,15 +986,6 @@ static int track_set_exec(bContext *C, wmOperator *op)
 		}
 		CTX_DATA_END;
 	}
-	else {
-		CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
-			if(ob!=obact) {
-				ob->track= obact;
-				ob->recalc |= OB_RECALC;
-			}
-		}
-		CTX_DATA_END;
-	}
 	
 	DAG_scene_sort(scene);
 	DAG_ids_flush_update(0);
@@ -1353,7 +1342,6 @@ void single_object_users(Scene *scene, View3D *v3d, int flag)
 			modifiers_foreachObjectLink(base->object, single_object_users__forwardModifierLinks, NULL);
 			
 			ID_NEW(ob->parent);
-			ID_NEW(ob->track);
 		}
 	}
 
@@ -1732,7 +1720,6 @@ static int make_local_exec(bContext *C, wmOperator *op)
 	CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
 		if(ob->id.lib==NULL) {
 			ID_NEW(ob->parent);
-			ID_NEW(ob->track);
 		}
 	}
 	CTX_DATA_END;