asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #34123 from nekomatata/joint-spatial-gizmo-errors

Browse source 
Fixed errors in JointSpatialGizmoPlugin when selecting a joint with unset nodes
This commit is contained in:
Rémi Verschelde 2019-12-05 19:51:00 +01:00 committed by GitHub
commit 9002b045c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
editor/spatial_editor_gizmos.cpp
View file

@ -202,6 +202,9 @@ void EditorSpatialGizmo::add_mesh(const Ref<ArrayMesh> &p_mesh, bool p_billboard
}
void EditorSpatialGizmo::add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard) {
if (p_lines.empty()) {
return;
}
ERR_FAIL_COND(!spatial_node);
Instance ins;
@ -4190,8 +4193,19 @@ void JointSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
p_gizmo->clear();
const Spatial *node_body_a = Object::cast_to<Spatial>(joint->get_node(joint->get_node_a()));
const Spatial *node_body_b = Object::cast_to<Spatial>(joint->get_node(joint->get_node_b()));
Spatial *node_body_a = NULL;
if (!joint->get_node_a().is_empty()) {
node_body_a = Object::cast_to<Spatial>(joint->get_node(joint->get_node_a()));
}
Spatial *node_body_b = NULL;
if (!joint->get_node_b().is_empty()) {
node_body_b = Object::cast_to<Spatial>(joint->get_node(joint->get_node_b()));
}
if (!node_body_a && !node_body_b) {
return;
}
Ref<Material> common_material = get_material("joint_material", p_gizmo);
Ref<Material> body_a_material = get_material("joint_body_a_material", p_gizmo);