Collections/Layer cleanup: Remove TODO_LAYER_OVERRIDE from most places

This was originally a good idea. However we will need to pay special attention
to this when doing the dynamic overrides anyways. The placeholders won't be
enough to spare us that job.

That said I left the ones on layer.c because we are actually calling these
BKE_override_*_add() functions from doversion, yet they don't do anything.

4 files changed, 0 insertions, 55 deletions

diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c
index 1ffe62fbc00..4de0f2f5774 100644
--- a/source/blender/editors/space_outliner/outliner_collections.c
+++ b/source/blender/editors/space_outliner/outliner_collections.c
@@ -79,15 +79,6 @@ SceneCollection *outliner_scene_collection_from_tree_element(TreeElement *te)
 	return NULL;
 }
 
-#if 0
-static CollectionOverride *outliner_override_active(bContext *UNUSED(C))
-{
-	TODO_LAYER_OPERATORS;
-	TODO_LAYER_OVERRIDE;
-	return NULL;
-}
-#endif
-
 /* -------------------------------------------------------------------- */
 /* Poll functions. */
 
@@ -572,46 +563,6 @@ void OUTLINER_OT_collection_objects_remove(wmOperatorType *ot)
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
-/**********************************************************************************/
-
-/**
- * Returns true is selected element is a collection
- */
-static int collection_override_new_poll(bContext *(C))
-{
-#ifdef TODO_LAYER_OVERRIDE
-	/* disable for now, since it's not implemented */
-	(void) C;
-	return 0;
-#else
-	return outliner_collection_active(C) ? 1 : 0;
-#endif
-}
-
-static int collection_override_new_invoke(bContext *UNUSED(C), wmOperator *op, const wmEvent *UNUSED(event))
-{
-	TODO_LAYER_OPERATORS;
-	TODO_LAYER_OVERRIDE;
-	BKE_report(op->reports, RPT_ERROR, "OUTLINER_OT_collections_override_new not implemented yet");
-	return OPERATOR_CANCELLED;
-}
-
-/* in the middle of renames remove s */
-void OUTLINER_OT_collection_override_new(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name = "New Override";
-	ot->idname = "OUTLINER_OT_collection_override_new";
-	ot->description = "Add a new override to the active collection";
-
-	/* api callbacks */
-	ot->invoke = collection_override_new_invoke;
-	ot->poll = collection_override_new_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-}
-
 struct CollectionDeleteData {
 	Scene *scene;
 	SpaceOops *soops;
@@ -666,8 +617,6 @@ static int collection_delete_exec(bContext *C, wmOperator *UNUSED(op))
 
 	data.collections_to_delete = BLI_gset_ptr_new(__func__);
 
-	TODO_LAYER_OVERRIDE; /* handle overrides */
-
 	/* We first walk over and find the SceneCollections we actually want to delete (ignoring duplicates). */
 	outliner_tree_traverse(soops, &soops->tree, 0, TSE_SELECTED, collection_find_data_to_delete, &data);
 
diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 9e8433a519a..b6ca2ff1ad0 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -340,7 +340,6 @@ void OUTLINER_OT_collection_toggle(struct wmOperatorType *ot);
 void OUTLINER_OT_collection_link(struct wmOperatorType *ot);
 void OUTLINER_OT_collection_unlink(struct wmOperatorType *ot);
 void OUTLINER_OT_collection_new(struct wmOperatorType *ot);
-void OUTLINER_OT_collection_override_new(struct wmOperatorType *ot);
 void OUTLINER_OT_collection_objects_remove(struct wmOperatorType *ot);
 void OUTLINER_OT_collection_objects_select(struct wmOperatorType *ot);
 void OUTLINER_OT_collection_objects_deselect(struct wmOperatorType *ot);
diff --git a/source/blender/editors/space_outliner/outliner_ops.c b/source/blender/editors/space_outliner/outliner_ops.c
index 9022552c429..9296cfb05e1 100644
--- a/source/blender/editors/space_outliner/outliner_ops.c
+++ b/source/blender/editors/space_outliner/outliner_ops.c
@@ -330,7 +330,6 @@ void outliner_operatortypes(void)
 	WM_operatortype_append(OUTLINER_OT_collection_link);
 	WM_operatortype_append(OUTLINER_OT_collection_unlink);
 	WM_operatortype_append(OUTLINER_OT_collection_new);
-	WM_operatortype_append(OUTLINER_OT_collection_override_new);
 	WM_operatortype_append(OUTLINER_OT_collection_objects_select);
 	WM_operatortype_append(OUTLINER_OT_collection_objects_deselect);
 
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index ef3d7c0ae88..184c5f5c636 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -2034,8 +2034,6 @@ static void rna_def_layer_collection(BlenderRNA *brna)
 	RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
 	RNA_def_property_ui_text(prop, "Enabled", "Enable or disable collection");
 	RNA_def_property_update(prop, NC_SCENE | ND_LAYER_CONTENT, "rna_LayerCollection_flag_update");
-
-	/* TODO_LAYER_OVERRIDE */
 }
 
 static void rna_def_layer_collections(BlenderRNA *brna, PropertyRNA *cprop)