summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/array.cpp1
-rw-r--r--doc/classes/SurfaceTool.xml11
-rw-r--r--editor/editor_properties.cpp2
-rw-r--r--editor/find_in_files.cpp12
-rw-r--r--modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs6
-rw-r--r--servers/audio_server.cpp1
6 files changed, 20 insertions, 13 deletions
diff --git a/core/array.cpp b/core/array.cpp
index 9f09ddbe15..9708452850 100644
--- a/core/array.cpp
+++ b/core/array.cpp
@@ -258,7 +258,6 @@ struct _ArrayVariantSortCustom {
Array &Array::sort_custom(Object *p_obj, const StringName &p_function) {
ERR_FAIL_NULL_V(p_obj, *this);
- ERR_FAIL_COND_V(!p_obj->has_method(p_function), *this);
SortArray<Variant, _ArrayVariantSortCustom, true> avs;
avs.compare.obj = p_obj;
diff --git a/doc/classes/SurfaceTool.xml b/doc/classes/SurfaceTool.xml
index deda7bc292..4f9ac68e47 100644
--- a/doc/classes/SurfaceTool.xml
+++ b/doc/classes/SurfaceTool.xml
@@ -14,6 +14,7 @@
[/codeblock]
The [code]SurfaceTool[/code] now contains one vertex of a triangle which has a UV coordinate and a specified [Color]. If another vertex were added without calls to [method add_uv] or [method add_color] then the last values would be used.
It is very important that vertex attributes are passed [b]before[/b] the call to [method add_vertex], failure to do this will result in an error when committing the vertex information to a mesh.
+ Additionally, the attributes used before the first vertex is added determine the format of the mesh. For example if you only add UVs to the first vertex, you cannot add color to any of the subsequent vertices.
</description>
<tutorials>
</tutorials>
@@ -26,7 +27,7 @@
<argument index="0" name="bones" type="PoolIntArray">
</argument>
<description>
- Add an array of bones for the next Vertex to use.
+ Add an array of bones for the next Vertex to use. Array must contain 4 integers.
</description>
</method>
<method name="add_color">
@@ -99,6 +100,7 @@
</argument>
<description>
Insert a triangle fan made of array data into [Mesh] being constructed.
+ Requires primitive type be set to [code]PRIMITIVE_TRIANGLES[/code].
</description>
</method>
<method name="add_uv">
@@ -134,7 +136,7 @@
<argument index="0" name="weights" type="PoolRealArray">
</argument>
<description>
- Specify weight value for next Vertex to use.
+ Specify weight values for next Vertex to use. Array must contain 4 values.
</description>
</method>
<method name="append_from">
@@ -147,6 +149,7 @@
<argument index="2" name="transform" type="Transform">
</argument>
<description>
+ Append vertices from a given [Mesh] surface onto the current vertex array with specified [Transform].
</description>
</method>
<method name="begin">
@@ -184,6 +187,7 @@
<argument index="1" name="surface" type="int">
</argument>
<description>
+ Creates a vertex array from an existing [Mesh].
</description>
</method>
<method name="deindex">
@@ -201,12 +205,15 @@
<description>
Generates normals from Vertices so you do not have to do it manually.
Setting "flip" [code]true[/code] inverts resulting normals.
+ Requires primitive type to be set to [code]PRIMITIVE_TRIANGLES[/code].
</description>
</method>
<method name="generate_tangents">
<return type="void">
</return>
<description>
+ Generates a tangent vector for each vertex.
+ Requires that each vertex have UVs and normals set already.
</description>
</method>
<method name="index">
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 6eba9a9b67..7f2500e509 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -2380,7 +2380,7 @@ void EditorPropertyResource::update_property() {
if (res->get_name() != String()) {
assign->set_text(res->get_name());
} else if (res->get_path().is_resource_file()) {
- assign->set_text(res->get_name());
+ assign->set_text(res->get_path().get_file());
assign->set_tooltip(res->get_path());
} else {
assign->set_text(res->get_class());
diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp
index f88d1b24a6..0ccaa95fb7 100644
--- a/editor/find_in_files.cpp
+++ b/editor/find_in_files.cpp
@@ -336,12 +336,10 @@ FindInFilesDialog::FindInFilesDialog() {
_whole_words_checkbox = memnew(CheckBox);
_whole_words_checkbox->set_text(TTR("Whole Words"));
- _whole_words_checkbox->set_pressed(true);
hbc->add_child(_whole_words_checkbox);
_match_case_checkbox = memnew(CheckBox);
_match_case_checkbox->set_text(TTR("Match Case"));
- _match_case_checkbox->set_pressed(true);
hbc->add_child(_match_case_checkbox);
gc->add_child(hbc);
@@ -563,7 +561,7 @@ FindInFilesPanel::FindInFilesPanel() {
_cancel_button = memnew(Button);
_cancel_button->set_text(TTR("Cancel"));
_cancel_button->connect("pressed", this, "_on_cancel_button_clicked");
- _cancel_button->set_disabled(true);
+ _cancel_button->hide();
hbc->add_child(_cancel_button);
vbc->add_child(hbc);
@@ -642,7 +640,7 @@ void FindInFilesPanel::start_search() {
_finder->start();
update_replace_buttons();
- _cancel_button->set_disabled(false);
+ _cancel_button->show();
}
void FindInFilesPanel::stop_search() {
@@ -652,7 +650,7 @@ void FindInFilesPanel::stop_search() {
_status_label->set_text("");
update_replace_buttons();
set_progress_visible(false);
- _cancel_button->set_disabled(true);
+ _cancel_button->hide();
}
void FindInFilesPanel::_notification(int p_what) {
@@ -688,7 +686,7 @@ void FindInFilesPanel::_on_result_found(String fpath, int line_number, int begin
// Do this first because it resets properties of the cell...
item->set_cell_mode(text_index, TreeItem::CELL_MODE_CUSTOM);
- String item_text = String::num_int64(line_number) + ": " + text.replace("\t", " ");
+ String item_text = vformat("%3s: %s", line_number, text.replace("\t", " "));
item->set_text(text_index, item_text);
item->set_custom_draw(text_index, this, "_draw_result_text");
@@ -754,7 +752,7 @@ void FindInFilesPanel::_on_finished() {
_status_label->set_text(TTR("Search complete"));
update_replace_buttons();
set_progress_visible(false);
- _cancel_button->set_disabled(true);
+ _cancel_button->hide();
}
void FindInFilesPanel::_on_cancel_button_clicked() {
diff --git a/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs b/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs
index 9f0d562ef7..5fd708d539 100644
--- a/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs
+++ b/modules/mono/editor/GodotSharpTools/Editor/GodotSharpExport.cs
@@ -41,9 +41,11 @@ namespace GodotSharpTools.Editor
string outputDataDir = Path.Combine(outputDir, GetDataDirName());
- Directory.Delete(outputDataDir, recursive: true); // Clean first
+ if (Directory.Exists(outputDataDir))
+ Directory.Delete(outputDataDir, recursive: true); // Clean first
+
Directory.CreateDirectory(outputDataDir);
-
+
foreach (string dir in Directory.GetDirectories(templateDirPath, "*", SearchOption.AllDirectories))
{
Directory.CreateDirectory(Path.Combine(outputDataDir, dir.Substring(templateDirPath.Length + 1)));
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index fead2f54da..d36057b465 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -1297,6 +1297,7 @@ void AudioServer::_bind_methods() {
ADD_SIGNAL(MethodInfo("bus_layout_changed"));
BIND_ENUM_CONSTANT(SPEAKER_MODE_STEREO);
+ BIND_ENUM_CONSTANT(SPEAKER_SURROUND_31);
BIND_ENUM_CONSTANT(SPEAKER_SURROUND_51);
BIND_ENUM_CONSTANT(SPEAKER_SURROUND_71);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-07 17:54:39 +0000