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

Merge pull request #22225 from groud/fix_draw_on_viewport

Browse Source 
Fixes drawing of the 2D plugins on the 3D view
This commit is contained in:
Rémi Verschelde
2018-09-20 21:45:16 +02:00
committed by GitHub
parent f93a69cb6e 5172642c32
commit 76ca46d1f4
18 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -3026,6 +3026,7 @@ bool CanvasItemEditor::_build_bones_list(Node *p_node) {
}
void CanvasItemEditor::_draw_viewport() {
// Update the transform
transform = Transform2D();
transform.scale_basis(Size2(zoom, zoom));
@@ -3074,11 +3075,11 @@ void CanvasItemEditor::_draw_viewport() {
EditorPluginList *over_plugin_list = editor->get_editor_plugins_over();
if (!over_plugin_list->empty()) {
over_plugin_list->forward_draw_over_viewport(viewport);
over_plugin_list->forward_canvas_draw_over_viewport(viewport);
}
EditorPluginList *force_over_plugin_list = editor->get_editor_plugins_force_over();
if (!force_over_plugin_list->empty()) {
force_over_plugin_list->forward_force_draw_over_viewport(viewport);
force_over_plugin_list->forward_canvas_force_draw_over_viewport(viewport);
}
_draw_bones();