浏览代码

Merge pull request #38863 from neikeq/csharp-no-false-error-objtype-reload

Mono/C#: Remove script load error about not a Godot.Object
Rémi Verschelde 5 年之前
父节点
当前提交
cba1f492cc
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      modules/mono/csharp_script.cpp

+ 1 - 3
modules/mono/csharp_script.cpp

@@ -3240,9 +3240,7 @@ Error CSharpScript::reload(bool p_keep_state) {
 			ERR_FAIL_NULL_V(namespace_, ERR_BUG);
 			ERR_FAIL_NULL_V(class_name, ERR_BUG);
 			GDMonoClass *klass = project_assembly->get_class(namespace_->operator String(), class_name->operator String());
-			if (klass) {
-				bool obj_type = CACHED_CLASS(GodotObject)->is_assignable_from(klass);
-				ERR_FAIL_COND_V(!obj_type, ERR_BUG);
+			if (klass && CACHED_CLASS(GodotObject)->is_assignable_from(klass)) {
 				script_class = klass;
 			}
 		} else {