blackboard/blackboard_plan.cpp

@@ -147,13 +147,7 @@ bool BlackboardPlan::_get(const StringName &p_name, Variant &r_ret) const {
 	if (name_str.begins_with("mapping/")) {
 		StringName mapped_var_name = name_str.get_slicec('/', 1);
 		ERR_FAIL_COND_V(mapped_var_name == StringName(), false);
-		if (has_mapping(mapped_var_name)) {
+		r_ret = parent_scope_mapping.has(mapped_var_name) ? parent_scope_mapping[mapped_var_name] : StringName();
-			r_ret = parent_scope_mapping[mapped_var_name];
-		} else if (has_property_binding(mapped_var_name)) {
-			r_ret = RTR("Already bound to property.");
-		} else {
-			r_ret = StringName();
-		}
 		return true;
 	}
 
@@ -161,13 +155,7 @@ bool BlackboardPlan::_get(const StringName &p_name, Variant &r_ret) const {
 	if (name_str.begins_with("binding/")) {
 		StringName bound_var = name_str.get_slicec('/', 1);
 		ERR_FAIL_COND_V(bound_var == StringName(), false);
-		if (has_property_binding(bound_var)) {
+		r_ret = property_bindings.has(bound_var) ? property_bindings[bound_var] : NodePath();
-			r_ret = property_bindings[bound_var];
-		} else if (has_mapping(bound_var)) {
-			r_ret = RTR("Already mapped to variable.");
-		} else {
-			r_ret = NodePath();
-		}
 		return true;
 	}
 
@@ -200,7 +188,7 @@ void BlackboardPlan::_get_property_list(List<PropertyInfo> *p_list) const {
 
 #ifdef TOOLS_ENABLED
 		// * Editor
-		if (!_is_var_hidden(var_name, var)) {
+		if (var.get_type() != Variant::NIL && (!is_derived() || !var_name.begins_with("_"))) {
 			if (has_mapping(var_name) || has_property_binding(var_name)) {
 				p_list->push_back(PropertyInfo(Variant::STRING, var_name, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY));
 			} else {
@@ -226,35 +214,21 @@ void BlackboardPlan::_get_property_list(List<PropertyInfo> *p_list) const {
 	if (is_mapping_enabled()) {
 		p_list->push_back(PropertyInfo(Variant::NIL, "Mapping", PROPERTY_HINT_NONE, "mapping/", PROPERTY_USAGE_GROUP));
 		for (const Pair<StringName, BBVariable> &p : var_list) {
-			if (_is_var_hidden(p.first, p.second)) {
-				continue;
-			}
-			if (unlikely(has_property_binding(p.first))) {
-				p_list->push_back(PropertyInfo(Variant::STRING, "mapping/" + p.first, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY));
-			} else {
 			// Serialize only non-empty mappings.
 			PropertyUsageFlags usage = has_mapping(p.first) ? PROPERTY_USAGE_DEFAULT : PROPERTY_USAGE_EDITOR;
 			p_list->push_back(PropertyInfo(Variant::STRING_NAME, "mapping/" + p.first, PROPERTY_HINT_NONE, "", usage));
 		}
 	}
-	}
 
 	// * Binding
 	p_list->push_back(PropertyInfo(Variant::NIL, "Binding", PROPERTY_HINT_NONE, "binding/", PROPERTY_USAGE_GROUP));
 	for (const Pair<StringName, BBVariable> &p : var_list) {
-		if (_is_var_hidden(p.first, p.second)) {
-			continue;
-		}
-		if (unlikely(has_mapping(p.first))) {
-			p_list->push_back(PropertyInfo(Variant::STRING, "binding/" + p.first, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_READ_ONLY));
-		} else {
 		PropertyUsageFlags usage = has_property_binding(p.first) ? PROPERTY_USAGE_DEFAULT : PROPERTY_USAGE_EDITOR;
 		// PROPERTY_HINT_LINK is used to signal that NodePath should point to a property.
 		// Our inspector plugin will know how to handle it.
 		p_list->push_back(PropertyInfo(Variant::NODE_PATH, "binding/" + p.first, PROPERTY_HINT_LINK, itos(p.second.get_type()), usage));
 	}
 }
-}
 
 bool BlackboardPlan::_property_can_revert(const StringName &p_name) const {
 	if (String(p_name).begins_with("mapping/")) {

blackboard/blackboard_plan.h

@@ -51,8 +51,6 @@ private:
 	// If true, NodePath variables will be prefetched, so that the vars will contain node pointers instead (upon BB creation/population).
 	bool prefetch_nodepath_vars = true;
 
-	_FORCE_INLINE_ bool _is_var_hidden(const String &p_name, const BBVariable &p_var) const { return p_var.get_type() == Variant::NIL || (is_derived() && p_name.begins_with("_")); }
-
 protected:
 	static void _bind_methods();
 

editor/editor_property_variable_name.cpp

@@ -245,11 +245,6 @@ bool EditorInspectorPluginVariableName::parse_property(Object *p_object, const V
 #elif LIMBOAI_GDEXTENSION
 bool EditorInspectorPluginVariableName::_parse_property(Object *p_object, const Variant::Type p_type, const String &p_path, const PropertyHint p_hint, const String &p_hint_text, const BitField<PropertyUsageFlags> p_usage, const bool p_wide) {
 #endif
-	if (p_usage & PROPERTY_USAGE_READ_ONLY) {
-		// Don't handle read-only properties using this plugin.
-		return false;
-	}
-
 	bool is_mapping = p_path.begins_with("mapping/");
 	if (!(p_type == Variant::Type::STRING_NAME || p_type == Variant::Type::STRING) || !(is_mapping || p_path.ends_with("_var") || p_path.ends_with("variable"))) {
 		return false;

util/limbo_compat.h

@@ -152,7 +152,6 @@ Variant _GLOBAL_DEF(const PropertyInfo &p_info, const Variant &p_default, bool p
 #define EDSCALE (EditorInterface::get_singleton()->get_editor_scale())
 
 String TTR(const String &p_text, const String &p_context = "");
-#define RTR(m_text) TTR(m_text)
 
 #endif // ! LIMBOAI_GDEXTENSION