Don't warn of mismatch between Object & NodePath
This commit is contained in:
parent
cfacd57f15
commit
43035839b1
|
@ -417,12 +417,14 @@ void BlackboardPlan::populate_blackboard(const Ref<Blackboard> &p_blackboard, bo
|
||||||
ERR_FAIL_COND(p_blackboard.is_null());
|
ERR_FAIL_COND(p_blackboard.is_null());
|
||||||
for (const Pair<StringName, BBVariable> &p : var_list) {
|
for (const Pair<StringName, BBVariable> &p : var_list) {
|
||||||
if (p_blackboard->has_local_var(p.first) && !overwrite) {
|
if (p_blackboard->has_local_var(p.first) && !overwrite) {
|
||||||
|
#ifdef DEBUG_ENABLED
|
||||||
Variant::Type existing_type = p_blackboard->get_var(p.first).get_type();
|
Variant::Type existing_type = p_blackboard->get_var(p.first).get_type();
|
||||||
Variant::Type planned_type = p.second.get_type();
|
Variant::Type planned_type = p.second.get_type();
|
||||||
if (existing_type != planned_type && existing_type != Variant::NIL && planned_type != Variant::NIL) {
|
if (existing_type != planned_type && existing_type != Variant::NIL && planned_type != Variant::NIL && !(existing_type == Variant::OBJECT && planned_type == Variant::NODE_PATH)) {
|
||||||
WARN_PRINT(vformat("BlackboardPlan: Not overwriting %s as it already exists in the blackboard, but it has a different type than planned (%s vs %s). File: %s",
|
WARN_PRINT(vformat("BlackboardPlan: Not overwriting %s as it already exists in the blackboard, but it has a different type than planned (%s vs %s). File: %s",
|
||||||
LimboUtility::get_singleton()->decorate_var(p.first), Variant::get_type_name(existing_type), Variant::get_type_name(planned_type), get_path()));
|
LimboUtility::get_singleton()->decorate_var(p.first), Variant::get_type_name(existing_type), Variant::get_type_name(planned_type), get_path()));
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
bool has_mapping = parent_scope_mapping.has(p.first);
|
bool has_mapping = parent_scope_mapping.has(p.first);
|
||||||
|
|
Loading…
Reference in New Issue