Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
46450979
Unverified
Commit
46450979
authored
May 22, 2020
by
Rémi Verschelde
Committed by
GitHub
May 22, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #38942 from neikeq/hinjaku-hinjaku
Fix editor ignoring 'single_window_mode' with no main scene
parents
2a3f650b
6852b296
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
main.cpp
main/main.cpp
+10
-6
No files found.
main/main.cpp
View file @
46450979
...
@@ -1958,6 +1958,16 @@ bool Main::start() {
...
@@ -1958,6 +1958,16 @@ bool Main::start() {
ProjectSettings
::
get_singleton
()
->
set_custom_property_info
(
"rendering/canvas_textures/default_texture_repeat"
,
PropertyInfo
(
Variant
::
INT
,
"rendering/canvas_textures/default_texture_repeat"
,
PROPERTY_HINT_ENUM
,
"Disable,Enable,Mirror"
));
ProjectSettings
::
get_singleton
()
->
set_custom_property_info
(
"rendering/canvas_textures/default_texture_repeat"
,
PropertyInfo
(
Variant
::
INT
,
"rendering/canvas_textures/default_texture_repeat"
,
PROPERTY_HINT_ENUM
,
"Disable,Enable,Mirror"
));
}
}
#ifdef TOOLS_ENABLED
if
(
editor
)
{
bool
editor_embed_subwindows
=
EditorSettings
::
get_singleton
()
->
get_setting
(
"interface/editor/single_window_mode"
);
if
(
editor_embed_subwindows
)
{
sml
->
get_root
()
->
set_embed_subwindows_hint
(
true
);
}
}
#endif
String
local_game_path
;
String
local_game_path
;
if
(
game_path
!=
""
&&
!
project_manager
)
{
if
(
game_path
!=
""
&&
!
project_manager
)
{
local_game_path
=
game_path
.
replace
(
"
\\
"
,
"/"
);
local_game_path
=
game_path
.
replace
(
"
\\
"
,
"/"
);
...
@@ -1991,12 +2001,6 @@ bool Main::start() {
...
@@ -1991,12 +2001,6 @@ bool Main::start() {
#ifdef TOOLS_ENABLED
#ifdef TOOLS_ENABLED
if
(
editor
)
{
if
(
editor
)
{
bool
editor_embed_subwindows
=
EditorSettings
::
get_singleton
()
->
get_setting
(
"interface/editor/single_window_mode"
);
if
(
editor_embed_subwindows
)
{
sml
->
get_root
()
->
set_embed_subwindows_hint
(
true
);
}
if
(
game_path
!=
GLOBAL_GET
(
"application/run/main_scene"
)
||
!
editor_node
->
has_scenes_in_session
())
{
if
(
game_path
!=
GLOBAL_GET
(
"application/run/main_scene"
)
||
!
editor_node
->
has_scenes_in_session
())
{
Error
serr
=
editor_node
->
load_scene
(
local_game_path
);
Error
serr
=
editor_node
->
load_scene
(
local_game_path
);
if
(
serr
!=
OK
)
{
if
(
serr
!=
OK
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment