godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10165 from ISylvox/resoucre-to-resource-2.1 

[2.1] Core/[io;object]: Fix Typo in resource_format_binary;object
This commit is contained in:
Rémi Verschelde 2017-08-11 10:36:40 +02:00 committed by GitHub
parent 69f650f98f 5014b9dc40
commit 6a9a5fe06d
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/resource_format_binary.cpp
View File

@ -777,7 +777,7 @@ Error ResourceInteractiveLoaderBinary::poll() {
if (!r) {
error = ERR_FILE_CORRUPT;
memdelete(obj); //bye
ERR_EXPLAIN(local_path + ":Resoucre type in resource field not a resource, type is: " + obj->get_type());
ERR_EXPLAIN(local_path + ":Resource type in resource field not a resource, type is: " + obj->get_type());
ERR_FAIL_COND_V(!r, ERR_FILE_CORRUPT);
}
@ -1047,7 +1047,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
uint32_t ext_resources_size = f->get_32();
for (uint32_t i = 0; i < ext_resources_size; i++) {
ExtResoucre er;
ExtResource er;
er.type = get_unicode_string();
er.path = get_unicode_string();
external_resources.push_back(er);
@ -1072,7 +1072,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
for (uint32_t i = 0; i < int_resources_size; i++) {
IntResoucre ir;
IntResource ir;
ir.path = get_unicode_string();
ir.offset = f->get_64();
internal_resources.push_back(ir);

8
core/io/resource_format_binary.h
View File

@ -53,19 +53,19 @@ class ResourceInteractiveLoaderBinary : public ResourceInteractiveLoader {
//Map<int,StringName> string_map;
Vector<StringName> string_map;
struct ExtResoucre {
struct ExtResource {
String path;
String type;
};
Vector<ExtResoucre> external_resources;
Vector<ExtResource> external_resources;
struct IntResoucre {
struct IntResource {
String path;
uint64_t offset;
};
Vector<IntResoucre> internal_resources;
Vector<IntResource> internal_resources;
String get_unicode_string();
void _advance_padding(uint32_t p_len);

2
core/object.cpp
View File

@ -1850,7 +1850,7 @@ void ObjectDB::cleanup() {
String node_name;
if (instances[*K]->is_type("Node"))
node_name = " - Node Name: " + String(instances[*K]->call("get_name"));
if (instances[*K]->is_type("Resoucre"))
if (instances[*K]->is_type("Resource"))
node_name = " - Resource Name: " + String(instances[*K]->call("get_name")) + " Path: " + String(instances[*K]->call("get_path"));
print_line("Leaked Instance: " + String(instances[*K]->get_type()) + ":" + itos(*K) + node_name);
}

2
editor/editor_plugin.h
View File

@ -88,7 +88,7 @@ public:
DOCK_SLOT_MAX
};
//TODO: send a resoucre for editing to the editor node?
//TODO: send a resource for editing to the editor node?
void add_control_to_container(CustomControlContainer p_location, Control *p_control);
ToolButton *add_control_to_bottom_panel(Control *p_control, const String &p_title);