godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #4174 from Hodes/master

Browse Source 
Multiple editor plugins for same obj type
This commit is contained in:
Rémi Verschelde
2016-04-06 18:41:51 +02:00
parent 2f12c2dd90 7a1d7af332
commit aad31ee986
7 changed files with 146 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/editor/plugins/spatial_editor_plugin.cpp
View File

@@ -834,10 +834,10 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
{
EditorNode *en = editor;
EditorPlugin *over_plugin = en->get_editor_plugin_over();
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
if (over_plugin) {
bool discard = over_plugin->forward_spatial_input_event(camera,p_event);
if (!over_plugin_list->empty()) {
bool discard = over_plugin_list->forward_spatial_input_event(camera,p_event);
if (discard)
return;
}
@@ -3576,9 +3576,9 @@ void SpatialEditor::_unhandled_key_input(InputEvent p_event) {
{
EditorNode *en = editor;
EditorPlugin *over_plugin = en->get_editor_plugin_over();
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
if (over_plugin && over_plugin->forward_input_event(p_event)) {
if (!over_plugin_list->empty() && over_plugin_list->forward_input_event(p_event)) {
return; //ate the over input event
}