summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/classes/TextFile.xml13
-rw-r--r--drivers/vulkan/SCsub4
-rw-r--r--editor/editor_node.cpp2
-rw-r--r--scene/resources/text_file.h2
4 files changed, 5 insertions, 16 deletions
diff --git a/doc/classes/TextFile.xml b/doc/classes/TextFile.xml
deleted file mode 100644
index 1c2c2ff25c..0000000000
--- a/doc/classes/TextFile.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class name="TextFile" inherits="Resource" version="4.0">
- <brief_description>
- </brief_description>
- <description>
- </description>
- <tutorials>
- </tutorials>
- <methods>
- </methods>
- <constants>
- </constants>
-</class>
diff --git a/drivers/vulkan/SCsub b/drivers/vulkan/SCsub
index 8d6eb6b199..2576f68f92 100644
--- a/drivers/vulkan/SCsub
+++ b/drivers/vulkan/SCsub
@@ -57,6 +57,10 @@ if env['builtin_vulkan']:
'FALLBACK_DATA_DIRS=\\"%s\\"' % '/usr/local/share:/usr/share',
'FALLBACK_CONFIG_DIRS=\\"%s\\"' % '/etc/xdg'
])
+ import platform
+ if (platform.system() == "Linux"):
+ # In glibc since 2.17 and musl libc since 1.1.24. Used by loader.c.
+ env_thirdparty.AppendUnique(CPPDEFINES=['HAVE_SECURE_GETENV'])
loader_sources = [thirdparty_dir + "/loader/" + file for file in loader_sources]
env_thirdparty.add_source_files(env.drivers_sources, loader_sources)
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index baee7abb32..56581d671a 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -5823,7 +5823,7 @@ EditorNode::EditorNode() {
EDITOR_DEF_RST("interface/scene_tabs/show_thumbnail_on_hover", true);
EDITOR_DEF_RST("interface/inspector/capitalize_properties", true);
EDITOR_DEF_RST("interface/inspector/default_float_step", 0.001);
- EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::REAL, "interface/inspector/default_float_step", PROPERTY_HINT_EXP_RANGE, "0,1,0"));
+ EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::REAL, "interface/inspector/default_float_step", PROPERTY_HINT_RANGE, "0,1,0"));
EDITOR_DEF_RST("interface/inspector/disable_folding", false);
EDITOR_DEF_RST("interface/inspector/auto_unfold_foreign_scenes", true);
EDITOR_DEF("interface/inspector/horizontal_vector2_editing", false);
diff --git a/scene/resources/text_file.h b/scene/resources/text_file.h
index 666c088d04..76c80ba509 100644
--- a/scene/resources/text_file.h
+++ b/scene/resources/text_file.h
@@ -36,8 +36,6 @@
class TextFile : public Resource {
- GDCLASS(TextFile, Resource);
-
private:
String text;
String path;