diff options
| -rw-r--r-- | .github/workflows/linux_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/macos_builds.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/windows_builds.yml | 2 | ||||
| -rw-r--r-- | doc/classes/EditorInterface.xml | 4 | ||||
| -rw-r--r-- | doc/classes/Thread.xml | 3 | ||||
| -rw-r--r-- | modules/csg/csg_shape.cpp | 11 | ||||
| -rw-r--r-- | modules/gdscript/doc_classes/@GDScript.xml | 2 |
7 files changed, 11 insertions, 15 deletions
diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml index a05bb09931..198727b30e 100644 --- a/.github/workflows/linux_builds.yml +++ b/.github/workflows/linux_builds.yml @@ -9,7 +9,7 @@ env: jobs: linux-editor: runs-on: "ubuntu-20.04" - name: Editor w/ Mono (target=release_debug, tools=yes) + name: Editor w/ Mono (target=release_debug, tools=yes, tests=yes) steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml index d9f41f09f7..bd3340111e 100644 --- a/.github/workflows/macos_builds.yml +++ b/.github/workflows/macos_builds.yml @@ -10,7 +10,7 @@ jobs: macos-editor: runs-on: "macos-latest" - name: Editor (target=release_debug, tools=yes) + name: Editor (target=release_debug, tools=yes, tests=yes) steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml index 2bc3fcfdaa..0d3c78b45d 100644 --- a/.github/workflows/windows_builds.yml +++ b/.github/workflows/windows_builds.yml @@ -14,7 +14,7 @@ jobs: runs-on: "windows-latest" # Windows Editor - checkout with the plugin - name: Editor (target=release_debug, tools=yes) + name: Editor (target=release_debug, tools=yes, tests=yes) steps: - uses: actions/checkout@v2 diff --git a/doc/classes/EditorInterface.xml b/doc/classes/EditorInterface.xml index 8b2b9c9350..9da36b51f9 100644 --- a/doc/classes/EditorInterface.xml +++ b/doc/classes/EditorInterface.xml @@ -51,8 +51,8 @@ <return type="Control"> </return> <description> - Returns the editor's [Viewport] instance. - [b]Note:[/b] This returns the main editor viewport containing the whole editor, not the 2D or 3D viewports specifically. + Returns the main editor control. Use this as a parent for main screens. + [b]Note:[/b] This returns the main editor control containing the whole editor, not the 2D or 3D viewports specifically. </description> </method> <method name="get_file_system_dock"> diff --git a/doc/classes/Thread.xml b/doc/classes/Thread.xml index 4d6e89fa6f..5c63d01322 100644 --- a/doc/classes/Thread.xml +++ b/doc/classes/Thread.xml @@ -7,7 +7,8 @@ A unit of execution in a process. Can run methods on [Object]s simultaneously. The use of synchronization via [Mutex] or [Semaphore] is advised if working with shared objects. </description> <tutorials> - <link>https://docs.godotengine.org/en/latest/tutorials/threads/using_multiple_threads.html</link> + <link title="Using multiple threads">https://docs.godotengine.org/en/latest/tutorials/threads/using_multiple_threads.html</link> + <link title="Thread-safe APIs">https://docs.godotengine.org/en/latest/tutorials/threads/thread_safe_apis.html</link> </tutorials> <methods> <method name="get_id" qualifiers="const"> diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp index cea006364f..82a47f594b 100644 --- a/modules/csg/csg_shape.cpp +++ b/modules/csg/csg_shape.cpp @@ -132,18 +132,13 @@ void CSGShape3D::_make_dirty() { return; } - if (dirty) { - return; - } - - dirty = true; - if (parent) { parent->_make_dirty(); - } else { - //only parent will do + } else if (!dirty) { call_deferred("_update_shape"); } + + dirty = true; } CSGBrush *CSGShape3D::_get_brush() { diff --git a/modules/gdscript/doc_classes/@GDScript.xml b/modules/gdscript/doc_classes/@GDScript.xml index c86b974f47..1ac47884c0 100644 --- a/modules/gdscript/doc_classes/@GDScript.xml +++ b/modules/gdscript/doc_classes/@GDScript.xml @@ -112,7 +112,7 @@ </argument> <description> Returns the arc tangent of [code]s[/code] in radians. Use it to get the angle from an angle's tangent in trigonometry: [code]atan(tan(angle)) == angle[/code]. - The method cannot know in which quadrant the angle should fall. See [method atan2] if you have both [code]y[code] and [code]x[/code]. + The method cannot know in which quadrant the angle should fall. See [method atan2] if you have both [code]y[/code] and [code]x[/code]. [codeblock] a = atan(0.5) # a is 0.463648 [/codeblock] |