summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-11-19 21:59:11 +0100
committerGitHub <noreply@github.com>2017-11-19 21:59:11 +0100
commitd2bc9613887d9ad02f5c3f95ebd65714fe5c4aee (patch)
tree7ca65f5bc48ea07f8ed1f2340b693fd1e50af0bd /scene
parentd40b1825fc7c21b80a9482ff7e3ee571dc237d17 (diff)
parent59c2e8906a5cb64b55f29d656a5a27366ace38a0 (diff)
Merge pull request #13000 from djrm/pr_import_fixes
import fixes
Diffstat (limited to 'scene')
-rw-r--r--scene/resources/mesh.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp
index 06b147ba41..0a886c25b1 100644
--- a/scene/resources/mesh.cpp
+++ b/scene/resources/mesh.cpp
@@ -1097,11 +1097,13 @@ void ArrayMesh::_bind_methods() {
}
void ArrayMesh::reload_from_file() {
- for (int i = 0; i < get_surface_count(); i++) {
- surface_remove(i);
- }
+ VisualServer::get_singleton()->mesh_clear(mesh);
+ surfaces.clear();
+ clear_blend_shapes();
+
Resource::reload_from_file();
- String path = get_path();
+
+ _change_notify();
}
ArrayMesh::ArrayMesh() {