[Bf-blender-cvs] [10c47349786] blender-v3.3-release: Fix T100173: fix missing removal of old name in BLO_update_defaults_startup_blend

[Aras Pranckevicius]

Commit: 10c47349786a1197e66f057f09c0bddab11da583
Author: Aras Pranckevicius
Date:   Wed Aug 3 19:09:21 2022 +0300
Branches: blender-v3.3-release
https://developer.blender.org/rB10c47349786a1197e66f057f09c0bddab11da583

Fix T100173: fix missing removal of old name in BLO_update_defaults_startup_blend

If a screen had to be renamed, the old name was not removed from
the name map. Fixes T100173.

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

M	source/blender/blenloader/intern/versioning_defaults.c

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

diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index a2e3fd5346e..0749625137a 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -45,6 +45,7 @@
 #include "BKE_layer.h"
 #include "BKE_lib_id.h"
 #include "BKE_main.h"
+#include "BKE_main_namemap.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
 #include "BKE_node.h"
@@ -488,6 +489,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
         if (layout->screen) {
           bScreen *screen = layout->screen;
           if (!STREQ(screen->id.name + 2, workspace->id.name + 2)) {
+            BKE_main_namemap_remove_name(bmain, &screen->id, screen->id.name + 2);
             BLI_strncpy(screen->id.name + 2, workspace->id.name + 2, sizeof(screen->id.name) - 2);
             BLI_libblock_ensure_unique_name(bmain, screen->id.name);
           }