diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-11 13:45:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 13:45:48 +0200 |
| commit | 32133a11b56761df99579ad96ee29a47d2aed6b4 (patch) | |
| tree | ab68992cfe6b1f59a618f713545fdcb3b6488b07 /editor/plugins/canvas_item_editor_plugin.cpp | |
| parent | bbdfc7353c3af72fcdf037ff10b8571aa2afc230 (diff) | |
| parent | 1bea8e1eacc68bcedbd3f207395bccf11011dae2 (diff) | |
Merge pull request #38386 from reduz/new-lightmapper
New GPU lightmapper
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 65c0763e63..b5fcf82d76 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -6161,7 +6161,7 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2 &p_point, const Varian type == "ViewportTexture" || type == "CurveTexture" || type == "GradientTexture" || - type == "StreamTexture" || + type == "StreamTexture2D" || type == "AtlasTexture" || type == "LargeTexture") { Ref<Texture2D> texture = Ref<Texture2D>(Object::cast_to<Texture2D>(*res)); |