[Bf-blender-cvs] [6fde8ab8db1] blender-projects-basics: Cleanup: variable names, memory debug names

[Julian Eisel]

Commit: 6fde8ab8db1f3410846ef03016bfe6dff3114661
Author: Julian Eisel
Date:   Thu Oct 6 15:52:22 2022 +0200
Branches: blender-projects-basics
https://developer.blender.org/rB6fde8ab8db1f3410846ef03016bfe6dff3114661

Cleanup: variable names, memory debug names

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

M	source/blender/blenkernel/BKE_blender_project.hh
M	source/blender/blenkernel/intern/blender_project.cc
M	source/blender/editors/space_project_settings/space_project_settings.cc

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

diff --git a/source/blender/blenkernel/BKE_blender_project.hh b/source/blender/blenkernel/BKE_blender_project.hh
index bd1a232b592..9ddecdfc729 100644
--- a/source/blender/blenkernel/BKE_blender_project.hh
+++ b/source/blender/blenkernel/BKE_blender_project.hh
@@ -19,7 +19,7 @@ namespace blender::bke {
 class ProjectSettings;
 
 class BlenderProject {
-  inline static std::unique_ptr<BlenderProject> instance_;
+  inline static std::unique_ptr<BlenderProject> active_;
 
   std::unique_ptr<ProjectSettings> settings_;
 
diff --git a/source/blender/blenkernel/intern/blender_project.cc b/source/blender/blenkernel/intern/blender_project.cc
index 99d92138ca5..429980774e4 100644
--- a/source/blender/blenkernel/intern/blender_project.cc
+++ b/source/blender/blenkernel/intern/blender_project.cc
@@ -33,18 +33,18 @@ BlenderProject::BlenderProject(std::unique_ptr<ProjectSettings> settings)
 BlenderProject *BlenderProject::set_active_from_settings(std::unique_ptr<ProjectSettings> settings)
 {
   if (settings) {
-    instance_ = std::make_unique<BlenderProject>(BlenderProject(std::move(settings)));
+    active_ = std::make_unique<BlenderProject>(BlenderProject(std::move(settings)));
   }
   else {
-    instance_ = nullptr;
+    active_ = nullptr;
   }
 
-  return instance_.get();
+  return active_.get();
 }
 
 BlenderProject *BlenderProject::get_active()
 {
-  return instance_.get();
+  return active_.get();
 }
 
 StringRef BlenderProject::project_root_path_find_from_path(StringRef path)
diff --git a/source/blender/editors/space_project_settings/space_project_settings.cc b/source/blender/editors/space_project_settings/space_project_settings.cc
index f9fcceca074..ec70a0a2721 100644
--- a/source/blender/editors/space_project_settings/space_project_settings.cc
+++ b/source/blender/editors/space_project_settings/space_project_settings.cc
@@ -216,7 +216,7 @@ void ED_spacetype_project_settings()
   BLI_addhead(&st->regiontypes, art);
 
   /* regions: navigation window */
-  art = MEM_cnew<ARegionType>("spacetype project settings region");
+  art = MEM_cnew<ARegionType>("spacetype project settings navigation region");
   art->regionid = RGN_TYPE_NAV_BAR;
   art->prefsizex = UI_NAVIGATION_REGION_WIDTH;
   art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_NAVBAR;
@@ -227,7 +227,7 @@ void ED_spacetype_project_settings()
   BLI_addhead(&st->regiontypes, art);
 
   /* regions: execution window */
-  art = MEM_cnew<ARegionType>("spacetype project settings region");
+  art = MEM_cnew<ARegionType>("spacetype project settings execute region");
   art->regionid = RGN_TYPE_EXECUTE;
   art->prefsizey = HEADERY;
   art->keymapflag = ED_KEYMAP_UI;