godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #76555 from Tetane/master 

Fix 2D shader preview draws over uniform
This commit is contained in:
Max Hilbrunner 2023-05-03 20:07:00 +02:00 committed by GitHub
parent f0080279d3 d3792a2373
commit 2816825e44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/plugins/material_editor_plugin.cpp
View File

@ -164,9 +164,19 @@ void MaterialEditor::_button_pressed(Node *p_button) {
MaterialEditor::MaterialEditor() {
// canvas item
vc_2d = memnew(SubViewportContainer);
vc_2d->set_stretch(true);
add_child(vc_2d);
vc_2d->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
viewport_2d = memnew(SubViewport);
vc_2d->add_child(viewport_2d);
viewport_2d->set_disable_input(true);
viewport_2d->set_transparent_background(true);
layout_2d = memnew(HBoxContainer);
layout_2d->set_alignment(BoxContainer::ALIGNMENT_CENTER);
add_child(layout_2d);
viewport_2d->add_child(layout_2d);
layout_2d->set_anchors_and_offsets_preset(PRESET_FULL_RECT);
rect_instance = memnew(ColorRect);

2
editor/plugins/material_editor_plugin.h
View File

@ -51,6 +51,8 @@ class MaterialEditor : public Control {
Vector2 rot;
SubViewportContainer *vc_2d = nullptr;
SubViewport *viewport_2d = nullptr;
HBoxContainer *layout_2d = nullptr;
ColorRect *rect_instance = nullptr;