瀏覽代碼

Merge pull request #61718 from ArshPanesar/Fixed-Populating-MultimeshInstance-Crash

Fixed Issue #61553 - Populating MultimeshInstance Crash
Rémi Verschelde 3 年之前
父節點
當前提交
9ca190dfe5
共有 1 個文件被更改,包括 9 次插入2 次删除
  1. 9 2
      editor/plugins/multimesh_editor_plugin.cpp

+ 9 - 2
editor/plugins/multimesh_editor_plugin.cpp

@@ -160,8 +160,15 @@ void MultiMeshEditor::_populate() {
 	int instance_count = populate_amount->get_value();
 
 	multimesh->set_transform_format(MultiMesh::TRANSFORM_3D);
-	multimesh->set_color_format(node->get_multimesh()->get_color_format());
-	multimesh->set_custom_data_format(node->get_multimesh()->get_custom_data_format());
+
+	if (node->get_multimesh().is_null()) {
+		multimesh->set_color_format(MultiMesh::COLOR_NONE);
+		multimesh->set_custom_data_format(MultiMesh::CUSTOM_DATA_NONE);
+	} else {
+		multimesh->set_color_format(node->get_multimesh()->get_color_format());
+		multimesh->set_custom_data_format(node->get_multimesh()->get_custom_data_format());
+	}
+
 	multimesh->set_instance_count(instance_count);
 
 	float _tilt_random = populate_tilt_random->get_value();