From 850a54a2a55f26a447967f47f99d09cfc2874b38 Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sat, 29 Jun 2019 21:45:14 +0200 Subject: Fix uninitialized variables in Line2D, JSONParseResult and TileMap --- core/bind/core_bind.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'core') diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 2885e7c0e0..3be5a08752 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -805,6 +805,9 @@ public: void set_result(const Variant &p_result); Variant get_result() const; + + JSONParseResult() : + error_line(-1) {} }; class _JSON : public Object { -- cgit v1.2.3 From 0db138a621c8ce67864379c2bf69fda54c380178 Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 30 Jun 2019 13:19:00 +0200 Subject: doc: Enforce default values for OS properties Otherwise we end up fetching values from the current OS instance when running doctool, so they would change based on the system or even simply due to changes to the system clipboard. --- core/bind/core_bind.cpp | 20 ++++++++++++++++++++ doc/classes/OS.xml | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 44573a0d97..da7b15da94 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -1317,6 +1317,26 @@ void _OS::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "window_position"), "set_window_position", "get_window_position"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "window_size"), "set_window_size", "get_window_size"); + // Those default values need to be specified for the docs generator, + // to avoid using values from the documentation writer's own OS instance. + ADD_PROPERTY_DEFAULT("clipboard", ""); + ADD_PROPERTY_DEFAULT("current_screen", 0); + ADD_PROPERTY_DEFAULT("exit_code", 0); + ADD_PROPERTY_DEFAULT("vsync_enabled", true); + ADD_PROPERTY_DEFAULT("low_processor_usage_mode", false); + ADD_PROPERTY_DEFAULT("keep_screen_on", true); + ADD_PROPERTY_DEFAULT("min_window_size", Vector2()); + ADD_PROPERTY_DEFAULT("max_window_size", Vector2()); + ADD_PROPERTY_DEFAULT("screen_orientation", 0); + ADD_PROPERTY_DEFAULT("window_borderless", false); + ADD_PROPERTY_DEFAULT("window_per_pixel_transparency_enabled", false); + ADD_PROPERTY_DEFAULT("window_fullscreen", false); + ADD_PROPERTY_DEFAULT("window_maximized", false); + ADD_PROPERTY_DEFAULT("window_minimized", false); + ADD_PROPERTY_DEFAULT("window_resizable", true); + ADD_PROPERTY_DEFAULT("window_position", Vector2()); + ADD_PROPERTY_DEFAULT("window_size", Vector2()); + BIND_ENUM_CONSTANT(VIDEO_DRIVER_GLES2); BIND_ENUM_CONSTANT(VIDEO_DRIVER_GLES3); diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index 9854c2dead..d73c85a6d9 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -800,7 +800,7 @@ - + The clipboard from the host OS. Might be unavailable on some platforms. @@ -845,13 +845,13 @@ Use [code]get_tree().get_root().set_transparent_background(true)[/code] to disable main viewport background rendering. [b]Note:[/b] This property has no effect if [b]Project > Project Settings > Display > Window > Per-pixel transparency > Allowed[/b] setting is disabled. - + The window position relative to the screen, the origin is the top left corner, +Y axis goes to the bottom and +X axis goes to the right. If [code]true[/code], the window is resizable by the user. - + The size of the window (without counting window manager decorations). -- cgit v1.2.3