blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

WIP: Basic Blender Project Support (experimental feature) #107655

Draft
Julian Eisel wants to merge 94 commits from blender-projects-basics into main
pull from: blender-projects-basics
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 94 Files Changed 78 +7 -7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6fde8ab8db - Show all commits

2
source/blender/blenkernel/BKE_blender_project.hh
View File

@ -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_;

8
source/blender/blenkernel/intern/blender_project.cc
View File

@ -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)

4
source/blender/editors/space_project_settings/space_project_settings.cc
View File

@ -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;