Skip to content

Commit 046c9f5

Browse files
committed
Merge pull request #105030 from Ivorforce/class-is-enabled-object
Move `GD_IS_CLASS_ENABLED` and respective include from `class_db.h` to `object.h`, as this is where it's needed.
2 parents b6539a7 + aa5ca4f commit 046c9f5

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

core/object/class_db.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,3 @@ _FORCE_INLINE_ Vector<Error> errarray(P... p_args) {
583583
}
584584

585585
#define GDREGISTER_NATIVE_STRUCT(m_class, m_code) ClassDB::register_native_struct(#m_class, m_code, sizeof(m_class))
586-
587-
#define GD_IS_CLASS_ENABLED(m_class) m_class::_class_is_enabled
588-
589-
#include "core/disabled_classes.gen.h"

core/object/object.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#pragma once
3232

33+
#include "core/disabled_classes.gen.h"
3334
#include "core/extension/gdextension_interface.h"
3435
#include "core/object/message_queue.h"
3536
#include "core/object/object_id.h"
@@ -131,6 +132,9 @@ enum PropertyUsageFlags {
131132
PROPERTY_USAGE_NO_EDITOR = PROPERTY_USAGE_STORAGE,
132133
};
133134

135+
// Respective values are defined by disabled_classes.gen.h
136+
#define GD_IS_CLASS_ENABLED(m_class) m_class::_class_is_enabled
137+
134138
#define ADD_SIGNAL(m_signal) ::ClassDB::add_signal(get_class_static(), m_signal)
135139
#define ADD_PROPERTY(m_property, m_setter, m_getter) ::ClassDB::add_property(get_class_static(), m_property, _scs_create(m_setter), _scs_create(m_getter))
136140
#define ADD_PROPERTYI(m_property, m_setter, m_getter, m_index) ::ClassDB::add_property(get_class_static(), m_property, _scs_create(m_setter), _scs_create(m_getter), m_index)

0 commit comments

Comments
 (0)