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
a8fce16b
Unverified
Commit
a8fce16b
authored
Jun 18, 2020
by
Rémi Verschelde
Committed by
GitHub
Jun 18, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39626 from bojidar-bg/x-tileset-editor-crash
Fix a random crash in the TileSet editor
parents
47eb607c
7850d031
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
tile_set_editor_plugin.cpp
editor/plugins/tile_set_editor_plugin.cpp
+3
-1
No files found.
editor/plugins/tile_set_editor_plugin.cpp
View file @
a8fce16b
...
@@ -492,12 +492,14 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) {
...
@@ -492,12 +492,14 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) {
tools
[
SHAPE_NEW_RECTANGLE
]
->
set_toggle_mode
(
true
);
tools
[
SHAPE_NEW_RECTANGLE
]
->
set_toggle_mode
(
true
);
tools
[
SHAPE_NEW_RECTANGLE
]
->
set_button_group
(
tg
);
tools
[
SHAPE_NEW_RECTANGLE
]
->
set_button_group
(
tg
);
tools
[
SHAPE_NEW_RECTANGLE
]
->
set_tooltip
(
TTR
(
"Create a new rectangle."
));
tools
[
SHAPE_NEW_RECTANGLE
]
->
set_tooltip
(
TTR
(
"Create a new rectangle."
));
tools
[
SHAPE_NEW_RECTANGLE
]
->
connect
(
"pressed"
,
callable_mp
(
this
,
&
TileSetEditor
::
_on_tool_clicked
),
varray
(
SHAPE_NEW_RECTANGLE
));
tools
[
SHAPE_NEW_POLYGON
]
=
memnew
(
ToolButton
);
tools
[
SHAPE_NEW_POLYGON
]
=
memnew
(
ToolButton
);
toolbar
->
add_child
(
tools
[
SHAPE_NEW_POLYGON
]);
toolbar
->
add_child
(
tools
[
SHAPE_NEW_POLYGON
]);
tools
[
SHAPE_NEW_POLYGON
]
->
set_toggle_mode
(
true
);
tools
[
SHAPE_NEW_POLYGON
]
->
set_toggle_mode
(
true
);
tools
[
SHAPE_NEW_POLYGON
]
->
set_button_group
(
tg
);
tools
[
SHAPE_NEW_POLYGON
]
->
set_button_group
(
tg
);
tools
[
SHAPE_NEW_POLYGON
]
->
set_tooltip
(
TTR
(
"Create a new polygon."
));
tools
[
SHAPE_NEW_POLYGON
]
->
set_tooltip
(
TTR
(
"Create a new polygon."
));
tools
[
SHAPE_NEW_POLYGON
]
->
connect
(
"pressed"
,
callable_mp
(
this
,
&
TileSetEditor
::
_on_tool_clicked
),
varray
(
SHAPE_NEW_POLYGON
));
separator_shape_toggle
=
memnew
(
VSeparator
);
separator_shape_toggle
=
memnew
(
VSeparator
);
toolbar
->
add_child
(
separator_shape_toggle
);
toolbar
->
add_child
(
separator_shape_toggle
);
...
@@ -1908,7 +1910,7 @@ void TileSetEditor::_on_tool_clicked(int p_tool) {
...
@@ -1908,7 +1910,7 @@ void TileSetEditor::_on_tool_clicked(int p_tool) {
}
}
}
}
}
}
}
else
if
(
p_tool
==
TOOL_SELECT
)
{
}
else
if
(
p_tool
==
TOOL_SELECT
||
p_tool
==
SHAPE_NEW_POLYGON
||
p_tool
==
SHAPE_NEW_RECTANGLE
)
{
if
(
creating_shape
)
{
if
(
creating_shape
)
{
// Cancel Creation
// Cancel Creation
creating_shape
=
false
;
creating_shape
=
false
;
...
...
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