Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from godotengine:master #139

Merged
merged 42 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
db70cf2
Mention native file dialogs editor setting in EditorFileDialog descri…
KoBeWi Oct 17, 2024
f7f6432
Make `PopupMenu/Panel` shadows properly visible again
YeldhamDev Apr 29, 2024
b8b1584
Don't emit text_changed signal when clearing empty LineEdit
KoBeWi Dec 11, 2024
66f9a75
Fix folders uncollapsed after restart with filter
KoBeWi Dec 14, 2024
b8f34bb
Rework dock layout management
KoBeWi Dec 18, 2024
ba54a28
Add more menus support to EditorContextMenuPlugin
KoBeWi Dec 18, 2024
637fe3c
Allow post-import plugins to modify _subresources
lyuma Dec 24, 2024
8e9c4e0
Assign new UID when duplicating file externally
KoBeWi Dec 30, 2024
e167f4d
Remember QuickOpenDialog history between sessions
KoBeWi Dec 11, 2024
f8fd156
Don't show "Drawing rect" when not actually drawing
KoBeWi Jan 3, 2025
db4ae2a
Show "transparent background" texture only behind actual texture in `…
arkology Dec 12, 2024
25a9b04
Correct aspect ratio used in FSR2 calculations to remove a source of …
clayjohn Jan 6, 2025
49846cf
Save instance and global uniform data in RenderingServerDummy so they…
clayjohn Jan 7, 2025
34d8255
Force build editor with regex module, remove checking code.
YYF233333 Dec 22, 2024
f6d22da
Update official export templates architecture list in docs
Summersay415 Jan 7, 2025
94a7dfe
Add additional methods for has_theme_item to check for font and font …
Jan 3, 2025
d6b822c
Cache value of Jolt Physics project setting `bounce_velocity_threshold`
mihe Jan 7, 2025
054340b
Add a supersampling option to LightmapGI
Geometror Jan 7, 2025
a6c7057
[Main] Fix missing performance data
AThousandShips Jan 7, 2025
731a1ec
Fix documentation tooltip over debug tooltip
Hilderin Jan 5, 2025
96e59b9
Cleanup editor history when opening the history menu popup & set appr…
AeioMuch Dec 6, 2024
b194e05
Merge pull request #91333 from YeldhamDev/working_on_this_felt_like_c…
akien-mga Jan 7, 2025
9a4142c
Merge pull request #98262 from KoBeWi/fileland_natives
akien-mga Jan 7, 2025
07093c4
Merge pull request #100275 from KoBeWi/highest_level_clearance
akien-mga Jan 7, 2025
7bbdcc8
Merge pull request #100419 from KoBeWi/times_before_search_were_better
akien-mga Jan 7, 2025
ce6c3c5
Merge pull request #100556 from KoBeWi/unlimited_contextizer
akien-mga Jan 7, 2025
1639174
Merge pull request #100558 from KoBeWi/docking_in_progress
akien-mga Jan 7, 2025
9788b3d
Merge pull request #100569 from arkology/texture-preview-borders
akien-mga Jan 7, 2025
0fee272
Merge pull request #100751 from YYF233333/force_regex_with_editor
akien-mga Jan 7, 2025
709f2e1
Merge pull request #100765 from Geometror/lightmapgi-add-downsampling
akien-mga Jan 7, 2025
de1499c
Merge pull request #100927 from KoBeWi/yeah,_uids
akien-mga Jan 7, 2025
3e53d73
Merge pull request #101038 from KoBeWi/QuickerOpenDialog
akien-mga Jan 7, 2025
b401a87
Merge pull request #101066 from DanielGSilva/font-variation-inheritance
akien-mga Jan 7, 2025
fdfa1f2
Merge pull request #101098 from KoBeWi/rect_pretender
akien-mga Jan 7, 2025
01913e0
Merge pull request #101156 from Hilderin/fix-documentation-tooltip-ov…
akien-mga Jan 7, 2025
21fdf16
Merge pull request #101193 from clayjohn/FSR-y-aspect
akien-mga Jan 7, 2025
a0c3798
Merge pull request #101210 from clayjohn/headless-export-shader
akien-mga Jan 7, 2025
0c76360
Merge pull request #101237 from mihe/jolt/cache-bounce-velocity
akien-mga Jan 7, 2025
f7b9a6a
Merge pull request #100091 from AeioMuch/fix_nodepath_in_history
akien-mga Jan 7, 2025
a7d84fa
Merge pull request #100792 from lyuma/post_import_plugin_subresources
akien-mga Jan 7, 2025
cecc83d
Merge pull request #101225 from Summersay415/arch-docs
akien-mga Jan 7, 2025
d2ada64
Merge pull request #101242 from AThousandShips/fix_perf
akien-mga Jan 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ methods.sort_module_list(env)

if env.editor_build:
# Add editor-specific dependencies to the dependency graph.
env.module_add_dependencies("editor", ["freetype", "svg"])
env.module_add_dependencies("editor", ["freetype", "regex", "svg"])

# And check if they are met.
if not env.module_check_dependencies("editor"):
Expand Down
5 changes: 5 additions & 0 deletions core/io/logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
#include "core/os/time.h"

#include "modules/modules_enabled.gen.h" // For regex.
#ifdef MODULE_REGEX_ENABLED
#include "modules/regex/regex.h"
#else
class RegEx : public RefCounted {};
#endif // MODULE_REGEX_ENABLED

#if defined(MINGW_ENABLED) || defined(_MSC_VER)
#define sprintf sprintf_s
Expand Down
8 changes: 2 additions & 6 deletions core/io/logger.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@
#include "core/io/file_access.h"
#include "core/string/ustring.h"
#include "core/templates/vector.h"
#include "modules/modules_enabled.gen.h" // For regex.
#ifdef MODULE_REGEX_ENABLED
#include "modules/regex/regex.h"
#endif // MODULE_REGEX_ENABLED

#include <stdarg.h>

class RegEx;

class Logger {
protected:
bool should_log(bool p_err);
Expand Down Expand Up @@ -90,9 +88,7 @@ class RotatedFileLogger : public Logger {
void clear_old_backups();
void rotate_file();

#ifdef MODULE_REGEX_ENABLED
Ref<RegEx> strip_ansi_regex;
#endif // MODULE_REGEX_ENABLED

public:
explicit RotatedFileLogger(const String &p_base_path, int p_max_files = 10);
Expand Down
23 changes: 21 additions & 2 deletions doc/classes/EditorContextMenuPlugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,30 @@
<constant name="CONTEXT_SLOT_FILESYSTEM" value="1" enum="ContextMenuSlot">
Context menu of FileSystem dock. [method _popup_menu] and option callback will be called with list of paths of the currently selected files.
</constant>
<constant name="CONTEXT_SLOT_SCRIPT_EDITOR" value="2" enum="ContextMenuSlot">
Context menu of Script editor's script tabs. [method _popup_menu] will be called with the path to the currently edited script, while option callback will receive reference to that script.
</constant>
<constant name="CONTEXT_SLOT_FILESYSTEM_CREATE" value="3" enum="ContextMenuSlot">
The "Create..." submenu of FileSystem dock's context menu. [method _popup_menu] and option callback will be called with list of paths of the currently selected files.
</constant>
<constant name="CONTEXT_SLOT_SCRIPT_EDITOR" value="2" enum="ContextMenuSlot">
Context menu of Scene dock. [method _popup_menu] will be called with the path to the currently edited script, while option callback will receive reference to that script.
<constant name="CONTEXT_SLOT_SCRIPT_EDITOR_CODE" value="4" enum="ContextMenuSlot">
Context menu of Script editor's code editor. [method _popup_menu] will be called with the path to the [CodeEdit] node. You can fetch it using this code:
[codeblock]
func _popup_menu(paths):
var code_edit = Engine.get_main_loop().root.get_node(paths[0]);
[/codeblock]
The option callback will receive reference to that node. You can use [CodeEdit] methods to perform symbol lookups etc.
</constant>
<constant name="CONTEXT_SLOT_SCENE_TABS" value="5" enum="ContextMenuSlot">
Context menu of scene tabs. [method _popup_menu] will be called with the path of the clicked scene, or empty [PackedStringArray] if the menu was opened on empty space. The option callback will receive the path of the clicked scene, or empty [String] if none was clicked.
</constant>
<constant name="CONTEXT_SLOT_2D_EDITOR" value="6" enum="ContextMenuSlot">
Context menu of 2D editor's basic right-click menu. [method _popup_menu] will be called with paths to all [CanvasItem] nodes under the cursor. You can fetch them using this code:
[codeblock]
func _popup_menu(paths):
var canvas_item = Engine.get_main_loop().root.get_node(paths[0]); # Replace 0 with the desired index.
[/codeblock]
The paths array is empty if there weren't any nodes under cursor. The option callback will receive a typed array of [CanvasItem] nodes.
</constant>
</constants>
</class>
1 change: 1 addition & 0 deletions doc/classes/EditorFileDialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
</brief_description>
<description>
[EditorFileDialog] is an enhanced version of [FileDialog] available only to editor plugins. Additional features include list of favorited/recent files and the ability to see files as thumbnails grid instead of list.
Unlike [FileDialog], [EditorFileDialog] does not have a property for using native dialogs. Instead, native dialogs can be enabled globally via the [member EditorSettings.interface/editor/use_native_file_dialogs] editor setting. They are also enabled automatically when running in sandbox (e.g. on macOS).
</description>
<tutorials>
</tutorials>
Expand Down
1 change: 1 addition & 0 deletions doc/classes/EditorScenePostImportPlugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
<param index="0" name="scene" type="Node" />
<description>
Pre Process the scene. This function is called right after the scene format loader loaded the scene and no changes have been made.
Pre process may be used to adjust internal import options in the [code]"nodes"[/code], [code]"meshes"[/code], [code]"animations"[/code] or [code]"materials"[/code] keys inside [code]get_option_value("_subresources")[/code].
</description>
</method>
<method name="add_import_option">
Expand Down
16 changes: 13 additions & 3 deletions doc/classes/LightmapGI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
If [code]true[/code], bakes lightmaps to contain directional information as spherical harmonics. This results in more realistic lighting appearance, especially with normal mapped materials and for lights that have their direct light baked ([member Light3D.light_bake_mode] set to [constant Light3D.BAKE_STATIC] and with [member Light3D.editor_only] set to [code]false[/code]). The directional information is also used to provide rough reflections for static and dynamic objects. This has a small run-time performance cost as the shader has to perform more work to interpret the direction information from the lightmap. Directional lightmaps also take longer to bake and result in larger file sizes.
[b]Note:[/b] The property's name has no relationship with [DirectionalLight3D]. [member directional] works with all light types.
</member>
<member name="environment_custom_color" type="Color" setter="set_environment_custom_color" getter="get_environment_custom_color">
<member name="environment_custom_color" type="Color" setter="set_environment_custom_color" getter="get_environment_custom_color" default="Color(1, 1, 1, 1)">
The color to use for environment lighting. Only effective if [member environment_mode] is [constant ENVIRONMENT_MODE_CUSTOM_COLOR].
</member>
<member name="environment_custom_energy" type="float" setter="set_environment_custom_energy" getter="get_environment_custom_energy">
<member name="environment_custom_energy" type="float" setter="set_environment_custom_energy" getter="get_environment_custom_energy" default="1.0">
The color multiplier to use for environment lighting. Only effective if [member environment_mode] is [constant ENVIRONMENT_MODE_CUSTOM_COLOR].
</member>
<member name="environment_custom_sky" type="Sky" setter="set_environment_custom_sky" getter="get_environment_custom_sky">
Expand All @@ -67,13 +67,23 @@
</member>
<member name="quality" type="int" setter="set_bake_quality" getter="get_bake_quality" enum="LightmapGI.BakeQuality" default="1">
The quality preset to use when baking lightmaps. This affects bake times, but output file sizes remain mostly identical across quality levels.
To further speed up bake times, decrease [member bounces], disable [member use_denoiser] and increase the lightmap texel size on 3D scenes in the Import dock.
To further speed up bake times, decrease [member bounces], disable [member use_denoiser] and/or decrease [member texel_scale].
To further increase quality, enable [member supersampling] and/or increase [member texel_scale].
</member>
<member name="shadowmask_mode" type="int" setter="set_shadowmask_mode" getter="get_shadowmask_mode" enum="LightmapGIData.ShadowmaskMode" default="0" experimental="">
The shadowmasking policy to use for directional shadows on static objects that are baked with this [LightmapGI] instance.
Shadowmasking allows [DirectionalLight3D] nodes to cast shadows even outside the range defined by their [member DirectionalLight3D.directional_shadow_max_distance] property. This is done by baking a texture that contains a shadowmap for the directional light, then using this texture according to the current shadowmask mode.
[b]Note:[/b] The shadowmask texture is only created if [member shadowmask_mode] is not [constant LightmapGIData.SHADOWMASK_MODE_NONE]. To see a difference, you need to bake lightmaps again after switching from [constant LightmapGIData.SHADOWMASK_MODE_NONE] to any other mode.
</member>
<member name="supersampling" type="bool" setter="set_supersampling_enabled" getter="is_supersampling_enabled" default="false">
If [code]true[/code], lightmaps are baked with the texel scale multiplied with [member supersampling_factor] and downsampled before saving the lightmap (so the effective texel density is identical to having supersampling disabled).
Supersampling provides increased lightmap quality with less noise, smoother shadows and better shadowing of small-scale features in objects. However, it may result in significantly increased bake times and memory usage while baking lightmaps. Padding is automatically adjusted to avoid increasing light leaking.
</member>
<member name="supersampling_factor" type="float" setter="set_supersampling_factor" getter="get_supersampling_factor" default="2.0">
The factor by which the texel density is multiplied for supersampling. For best results, use an integer value. While fractional values are allowed, they can result in increased light leaking and a blurry lightmap.
Higher values may result in better quality, but also increase bake times and memory usage while baking.
See [member supersampling] for more information.
</member>
<member name="texel_scale" type="float" setter="set_texel_scale" getter="get_texel_scale" default="1.0">
Scales the lightmap texel density of all meshes for the current bake. This is a multiplier that builds upon the existing lightmap texel size defined in each imported 3D scene, along with the per-mesh density multiplier (which is designed to be used when the same mesh is used at different scales). Lower values will result in faster bake times.
For example, doubling [member texel_scale] doubles the lightmap texture resolution for all objects [i]on each axis[/i], so it will [i]quadruple[/i] the texel count.
Expand Down
2 changes: 2 additions & 0 deletions doc/classes/PopupMenu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,8 @@
<member name="system_menu_id" type="int" setter="set_system_menu" getter="get_system_menu" enum="NativeMenu.SystemMenus" default="0">
If set to one of the values of [enum NativeMenu.SystemMenus], this [PopupMenu] is bound to the special system menu. Only one [PopupMenu] can be bound to each special menu at a time.
</member>
<member name="transparent" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
<member name="transparent_bg" type="bool" setter="set_transparent_background" getter="has_transparent_background" overrides="Viewport" default="true" />
</members>
<signals>
<signal name="id_focused">
Expand Down
4 changes: 4 additions & 0 deletions doc/classes/PopupPanel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
</description>
<tutorials>
</tutorials>
<members>
<member name="transparent" type="bool" setter="set_flag" getter="get_flag" overrides="Window" default="true" />
<member name="transparent_bg" type="bool" setter="set_transparent_background" getter="has_transparent_background" overrides="Viewport" default="true" />
</members>
<theme_items>
<theme_item name="panel" data_type="style" type="StyleBox">
[StyleBox] for the background panel.
Expand Down
1 change: 1 addition & 0 deletions doc/classes/ProjectSettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2464,6 +2464,7 @@
</member>
<member name="physics/jolt_physics_3d/simulation/bounce_velocity_threshold" type="float" setter="" getter="" default="1.0">
The minimum velocity needed before a collision can be bouncy, in meters per second.
[b]Note:[/b] This setting will only be read once during the lifetime of the application.
</member>
<member name="physics/jolt_physics_3d/simulation/continuous_cd_max_penetration" type="float" setter="" getter="" default="0.25">
Fraction of a body's inner radius that may penetrate another body while using continuous collision detection.
Expand Down
9 changes: 3 additions & 6 deletions editor/editor_dock_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#include "editor/editor_node.h"
#include "editor/editor_settings.h"
#include "editor/editor_string_names.h"
#include "editor/filesystem_dock.h"
#include "editor/gui/editor_bottom_panel.h"
#include "editor/themes/editor_scale.h"
#include "editor/window_wrapper.h"
Expand Down Expand Up @@ -480,6 +479,8 @@ void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const Str
Array bottom_docks_dump;
Array closed_docks_dump;
for (const KeyValue<Control *, DockInfo> &d : all_docks) {
d.key->call(SNAME("_save_layout_to_config"), p_layout, p_section);

if (!d.value.at_bottom && d.value.open && (!d.value.previous_at_bottom || !d.value.dock_window)) {
continue;
}
Expand Down Expand Up @@ -516,8 +517,6 @@ void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const Str
for (int i = 0; i < hsplits.size(); i++) {
p_layout->set_value(p_section, "dock_hsplit_" + itos(i + 1), int(hsplits[i]->get_split_offset() / EDSCALE));
}

FileSystemDock::get_singleton()->save_layout_to_config(p_layout, p_section);
}

void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const String &p_section, bool p_first_load) {
Expand Down Expand Up @@ -548,6 +547,7 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
continue;
}
Control *dock = dock_map[name];
dock->call(SNAME("_load_layout_from_config"), p_layout, p_section);

if (!all_docks[dock].enabled) {
// Don't open disabled docks.
Expand Down Expand Up @@ -612,9 +612,6 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
int ofs = p_layout->get_value(p_section, "dock_hsplit_" + itos(i + 1));
hsplits[i]->set_split_offset(ofs * EDSCALE);
}

FileSystemDock::get_singleton()->load_layout_from_config(p_layout, p_section);

_update_docks_menu();
}

Expand Down
19 changes: 17 additions & 2 deletions editor/editor_file_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -843,11 +843,26 @@ bool EditorFileSystem::_update_scan_actions() {

fs_changed = true;

const String new_file_path = ia.dir->get_file_path(idx);
const ResourceUID::ID existing_id = ResourceLoader::get_resource_uid(new_file_path);
if (existing_id != ResourceUID::INVALID_ID) {
const String old_path = ResourceUID::get_singleton()->get_id_path(existing_id);
if (old_path != new_file_path && FileAccess::exists(old_path)) {
const ResourceUID::ID new_id = ResourceUID::get_singleton()->create_id();
ResourceUID::get_singleton()->add_id(new_id, new_file_path);
ResourceSaver::set_uid(new_file_path, new_id);
WARN_PRINT(vformat("Duplicate UID detected for Resource at \"%s\".\nOld Resource path: \"%s\". The new file UID was changed automatically.", new_file_path, old_path));
} else {
// Re-assign the UID to file, just in case it was pulled from cache.
ResourceSaver::set_uid(new_file_path, existing_id);
}
}

if (ClassDB::is_parent_class(ia.new_file->type, SNAME("Script"))) {
_queue_update_script_class(ia.dir->get_file_path(idx), ia.new_file->type, ia.new_file->script_class_name, ia.new_file->script_class_extends, ia.new_file->script_class_icon_path);
_queue_update_script_class(new_file_path, ia.new_file->type, ia.new_file->script_class_name, ia.new_file->script_class_extends, ia.new_file->script_class_icon_path);
}
if (ia.new_file->type == SNAME("PackedScene")) {
_queue_update_scene_groups(ia.dir->get_file_path(idx));
_queue_update_scene_groups(new_file_path);
}

} break;
Expand Down
24 changes: 21 additions & 3 deletions editor/editor_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@
#include "editor/themes/editor_theme_manager.h"
#include "editor/window_wrapper.h"

#include <stdlib.h>

#include "modules/modules_enabled.gen.h" // For gdscript, mono.

#include <stdlib.h>

EditorNode *EditorNode::singleton = nullptr;

static const String EDITOR_NODE_CONFIG_SECTION = "EditorNode";
Expand Down Expand Up @@ -4886,11 +4886,29 @@ Ref<Texture2D> EditorNode::get_object_icon(const Object *p_object, const String
ERR_FAIL_NULL_V_MSG(p_object, nullptr, "Object cannot be null.");

Ref<Script> scr = p_object->get_script();

if (Object::cast_to<EditorDebuggerRemoteObject>(p_object)) {
String class_name;
if (scr.is_valid()) {
class_name = scr->get_global_name();

if (class_name.is_empty()) {
// If there is no class_name in this script we just take the script path.
class_name = scr->get_path();
}
}
return get_class_icon(class_name.is_empty() ? Object::cast_to<EditorDebuggerRemoteObject>(p_object)->type_name : class_name, p_fallback);
}

if (scr.is_null() && p_object->is_class("Script")) {
scr = p_object;
}

return _get_class_or_script_icon(p_object->get_class(), scr, p_fallback);
if (Object::cast_to<MultiNodeEdit>(p_object)) {
return get_class_icon(Object::cast_to<MultiNodeEdit>(p_object)->get_edited_class_name(), p_fallback);
} else {
return _get_class_or_script_icon(p_object->get_class(), scr, p_fallback);
}
}

Ref<Texture2D> EditorNode::get_class_icon(const String &p_class, const String &p_fallback) {
Expand Down
4 changes: 2 additions & 2 deletions editor/editor_node.h
Original file line number Diff line number Diff line change
Expand Up @@ -832,8 +832,8 @@ class EditorNode : public Node {
};

struct SceneEditorDataEntry {
bool is_editable;
bool is_display_folded;
bool is_editable = false;
bool is_display_folded = false;
};

HashMap<int, SceneModificationsEntry> scenes_modification_table;
Expand Down
13 changes: 3 additions & 10 deletions editor/export/codesign.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,15 @@

#include "core/crypto/crypto_core.h"
#include "core/io/dir_access.h"
#include "lipo.h"
#include "macho.h"

#include "core/io/plist.h"
#include "editor/editor_paths.h"
#include "lipo.h"
#include "macho.h"

#include "modules/modules_enabled.gen.h" // For regex.
#include "modules/regex/regex.h"

#include <ctime>

#ifdef MODULE_REGEX_ENABLED

#include "modules/regex/regex.h"

/*************************************************************************/
/* CodeSignCodeResources */
/*************************************************************************/
Expand Down Expand Up @@ -1571,5 +1566,3 @@ Error CodeSign::codesign(bool p_use_hardened_runtime, bool p_force, const String
ERR_FAIL_V_MSG(FAILED, "CodeSign: Unknown object type.");
}
}

#endif // MODULE_REGEX_ENABLED
6 changes: 0 additions & 6 deletions editor/export/codesign.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@
#include "core/io/file_access.h"
#include "core/object/ref_counted.h"

#include "modules/modules_enabled.gen.h" // For regex.

#ifdef MODULE_REGEX_ENABLED

/*************************************************************************/
/* CodeSignCodeResources */
/*************************************************************************/
Expand Down Expand Up @@ -356,6 +352,4 @@ class CodeSign {
static Error codesign(bool p_use_hardened_runtime, bool p_force, const String &p_path, const String &p_ent_path, String &r_error_msg);
};

#endif // MODULE_REGEX_ENABLED

#endif // CODESIGN_H
Loading