From 030f0f58a3cf794a1005aaafafa04f23657dcef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 15 Apr 2021 13:01:28 +0200 Subject: [PATCH] Scene: Remove unused `mesh_materials` StringNames They were added in 8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da (2.1 era) but were likely a first attempt that didn't get unused in the end. (cherry picked from commit 764eee03a438c81ec3a9f28f50201dcd77af96df) --- scene/scene_string_names.cpp | 5 ----- scene/scene_string_names.h | 4 ---- 2 files changed, 9 deletions(-) diff --git a/scene/scene_string_names.cpp b/scene/scene_string_names.cpp index bc5f7c4699d..6a06dc4f7f2 100644 --- a/scene/scene_string_names.cpp +++ b/scene/scene_string_names.cpp @@ -195,11 +195,6 @@ SceneStringNames::SceneStringNames() { _default = StaticCString::create("default"); - for (int i = 0; i < MAX_MATERIALS; i++) { - - mesh_materials[i] = "material/" + itos(i); - } - _mesh_changed = StaticCString::create("_mesh_changed"); parameters_base_path = "parameters/"; diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h index 0317ba357f7..f1376906ab4 100644 --- a/scene/scene_string_names.h +++ b/scene/scene_string_names.h @@ -207,10 +207,6 @@ public: StringName tracks_changed; - enum { - MAX_MATERIALS = 32 - }; - StringName mesh_materials[MAX_MATERIALS]; StringName _mesh_changed; };