Age | Commit message (Collapse) | Author |
|
(cherry picked from commit 06a1fe03644c57256b90b2840db1ef902187145a)
|
|
If calling set_mesh with a PrimitiveMesh that has pending update, the
_mesh_changed function would be called twice. The first time before
set_base had been called, which could lead to an ERROR message about
trying to set an invalid surface override material.
(cherry picked from commit 007b488a5c23b33c6e0b741b55a482e5229f2b90)
|
|
Having local_space enabled when starting a transform changed the
behavior of VIEW space transforms. Now we disable local_space when
starting a blender transform (there was already logic to restore the
setting after the transform ends).
This also hides the gizmo while performing a blender transform,
otherwise the user will see it snap back and forth between the local and
global alignment. I think the transform looks cleaner with the gizmo
hidden anyways.
Fixes #59392.
(cherry picked from commit 806425621cfa3daba3ba9f6b020726490a3152a4)
|
|
(cherry picked from commit 91e460d500c52505557ed79af4547f188b635589)
|
|
empty arrays
(cherry picked from commit 0a55a320857b5ddb8ba4e3b6c096acf617f24733)
|
|
Pretty hacky solution but it's better than an infinite loop.
All this import setup needs to be redone, it's very difficult to properly
bail out from an invalid import without triggering reimport loops.
Also fix underline not visible at default editor scale in LinkButton.
Fixes #73319.
(cherry picked from commit d81e6ee024a8c64b80ac25c96b33c749ba1db79d)
|
|
RenderingDevice texture update
(cherry picked from commit 06042a23b676c36f0afc1f3696d52cd60e79dc80)
|
|
Cherry-picks for the 4.0 branch (future 4.0.1) - 2nd batch
|
|
(cherry picked from commit 5a3dbea3ed95b6b1ff0847daf1669aa88515801b)
|
|
(cherry picked from commit e9d80a821d2b1e547ed82361f467e05846f8d611)
|
|
When using custom color management in blender the --version command will
output additional information infront of the "normal" output and this
prevented the import.
Fixes #74439.
(cherry picked from commit 7a0d12182e2808df083a58511f3d6b6023487e70)
|
|
(cherry picked from commit 016b2f3555d7a516c60cfda5c11ded276bb59de5)
|
|
Fixes error print for NavigationServer free when a RID can not be found.
(cherry picked from commit 73dc680fc127014ad805e5968f98ebb3e0281de7)
|
|
And adding a check to prevent future issues.
(cherry picked from commit ca86d53e7f9c6f9785f5ef48917e92d41296f984)
|
|
renaming get_used_cells_by_id to get_used_cells is not only unecessary, it introduces hard to debug issues
(cherry picked from commit d6a2197b3d5b50bc8d0b31c97d0abeaafe80269e)
|
|
(cherry picked from commit 25bc62ad13372490e7ba2c889174ceca34d1f33f)
|
|
Fixes #74339.
(cherry picked from commit b7ecb9584a1fc141d70140f6b0e573d870fa0dcb)
|
|
(cherry picked from commit e14fa5532bd87addc8c019e2b3770758b36d0c09)
|
|
(cherry picked from commit ba995c6ea1aa7f7eaff4e5d6673c7d6a096011dc)
|
|
(cherry picked from commit 0b0587af9775dc5e6fe5707f99634f280e22f4c7)
|
|
OpenGL3 renderer
(cherry picked from commit 46b416f3b1376c78e3ad8c8cd05e619f7b01f407)
|
|
(cherry picked from commit 602a0d2fbc84d598cffc79eccd5110f650b6e3c9)
|
|
(cherry picked from commit 16a2a164feef75b486dfb96d93cd993341a60faf)
|
|
(cherry picked from commit 0372bd56b69fd3a0f8efd6067deb30ee7a60e17d)
|
|
(cherry picked from commit 55a2ad25bf1591876032150cffff7b7c68dcaa17)
|
|
(cherry picked from commit ae8752a731ed0b1c9307bfc5ae817e917a887294)
|
|
spatial shader
(cherry picked from commit 528e0d095eba65804e3b4174f8138cdc920382a9)
|
|
(cherry picked from commit afb8693715db4889e79dc0994dfe21eec9e324f1)
|
|
(cherry picked from commit 903aa0e385ac79ca747029c0e12823b2671304a8)
|
|
(cherry picked from commit 45f4d59fa477d6e22adb02432449e0fda10ac5d2)
|
|
(cherry picked from commit 1adc4e5875782c064759bf810c511ac42b0f2d05)
|
|
outline is defined.
(cherry picked from commit 67762ec4a6c5e45951a238453188ce9f93cb24d9)
|
|
(cherry picked from commit 94355249c360be694bdb692f357dc017d742aee7)
|
|
Cancel code autocompletion when a numerical value is entered. Avoids interference when setting numbers.
(cherry picked from commit 688d00b70645a822ba694b13bcdb312e74d8c034)
|
|
(cherry picked from commit 3ee5fbdb73fbdec318a345cc797d2d1daf19895f)
|
|
MultiplayerPeerExtension isn't an exact replacement for
NetworkedMultiplayerCustom, but at least it gets you moving in the right direction.
Engine.editor_hint couldn't be fixed by the renames map, because you have to add a `()` at the end.
(cherry picked from commit 6b17c2b6e79adfbcd349ac16e1a1d31098562bc5)
|
|
In godot3, `tool` can follow keywords like `extends` and `class_name`
In godot4, `@tool` must be the first line in the file.
(cherry picked from commit 9a474fb99f18782b2fcafa750c1b899996e79737)
|
|
Lines that start with # or // are ignored
(cherry picked from commit 8cf7ac3a4509a5c42fe32099ea05e99311b9a2a9)
|
|
(cherry picked from commit fec630f360b93fa221acb7d47efd7aa9b1605801)
|
|
(cherry picked from commit a835dfd96d2a758fb194237954f0d4824ff08e05)
|
|
Fixes #70542.
The 3to4 conversion tool was not handling superclass constructors.
We should translate the godot3 syntax:
```gdscript
func _init(a,b,c).(a,b,c):
pass
func _init(a,b,c):
super(a,b,c)
```
Originally, the _init conversion was intended to remove `void` return types from _init functions, as this was disallowed due to #50589.
As that was resolved by #53366, I removed that part of the conversion logic. If a void return type is present on a constructor, the converter now leaves it.
Here's a sample diff from my own project:
```diff
@@ -103,10 +105,11 @@ class Real:
class Text:
extends Setting
- var choices: PoolStringArray
- var value: String setget set_value, get_value
+ var choices: PackedStringArray
+ var value: String : get = get_value, set = set_value
- func _init(section: String, key: String, default: String, choice_list: Array).(section, key, default) -> void:
+ func _init(section: String, key: String, default: String, choice_list: Array) -> void:
+ super(section, key, default)
choices = choice_list
func normalize(val):
@@ -129,9 +132,10 @@ class Text:
class Boolean:
extends Setting
- var value: bool setget set_value, get_value
+ var value: bool : get = get_value, set = set_value
- func _init(section: String, key: String, default: bool).(section, key, default) -> void:
+ func _init(section: String, key: String, default: bool) -> void:
+ super(section, key, default)
pass
```
(cherry picked from commit 53a00abb11cbbdceba7f7d027e7455854bfef01e)
|
|
Fixes #74204.
The style guide says
> Always use one space around operators and after commas
The 3to4 conversion tool currently strips space in certain scenarios.
I've updated it to add space whenever it is generating new code.
In any case where it substitutes existing code, it leaves it as-is.
For example, connect(a,b,c) becomes `connect(a, callable(b, c))`, because the converter is adding new commads/parens.
However, `xform(Vector3(a,b,c))` becomes `Transform * Vector3(a,b,c)` because it uses the user's original Vector3 string whole. If the user originally had `xform(Vector3(a, b, c))`, then it becomes `Transform * Vector3(a, b, c)`.
Ideally we'd always preserve original formatting, but this seems quite difficult, so I tried to preserve it where we can, but air on the side of following the style guide whenever we're transforming code.
(cherry picked from commit d3684e662fdf2611214efc721ea2276364ef9fe1)
|
|
Cherry-picks for the 4.0 branch (future 4.0.1) - 1st batch
|
|
(cherry picked from commit fb317546fe4ded0c5ea192ae9a870722a0d6e59c)
|
|
Prevents ending up with an empty C# menu.
The option to create the C# solution no longer disappears, to avoid confusing users.
If an user tries to use it when a C# solution already exists they are warned that it will override their sln and csproj files.
(cherry picked from commit a1a2fc22558af4b368a6f8a7686399cb0a19f220)
|
|
* After you click in the dock select panel
* After you load an editor layout
(cherry picked from commit 43bf0ca8d28de43ab0eeb7063bbaee01dd091d0e)
|
|
(cherry picked from commit 921f3b7589084e07a4b6eefd89ec7fe81857a8b7)
|
|
(cherry picked from commit ab61624c786f0e1556eacf374eaca2838edb9bec)
|
|
selected TileSet after an edit call with a null pointer.
(cherry picked from commit 66374c8dcee3eab1e0878e892be32cd257b43a5b)
|
|
(cherry picked from commit ea5fd3d732a85029e8372425904971ad26153ff1)
|