diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-24 12:05:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-24 12:05:43 +0200 |
| commit | b6e0eaf3ca74d9777c6869d8519db6264866d1e6 (patch) | |
| tree | 86bbaf966f284a6733b32a6594d832cd675d4969 | |
| parent | 1dc689b513697d4ab2df43fc6bf88fd32f5f5ffa (diff) | |
| parent | c1e771dfe909bab2aed595fbb8b8ef4c902ecf9b (diff) | |
Merge pull request #8509 from nunodonato/fixspatialmaterial
Fixed #8102, by renaming FixedSpatialMaterial to SpatialMaterial
| -rw-r--r-- | scene/3d/ray_cast.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index d3b4577c42..d24aa6ae2a 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -146,7 +146,7 @@ void RayCast::_notification(int p_what) { _update_raycast_state(); if (prev_collision_state != collided && get_tree()->is_debugging_collisions_hint()) { if (debug_material.is_valid()) { - Ref<FixedSpatialMaterial> line_material = static_cast<Ref<FixedSpatialMaterial> >(debug_material); + Ref<SpatialMaterial> line_material = static_cast<Ref<SpatialMaterial> >(debug_material); line_material->set_albedo(collided ? Color(1.0, 0, 0) : Color(1.0, 0.8, 0.6)); } } @@ -258,10 +258,10 @@ void RayCast::_bind_methods() { void RayCast::_create_debug_shape() { if (!debug_material.is_valid()) { - debug_material = Ref<FixedSpatialMaterial>(memnew(FixedSpatialMaterial)); + debug_material = Ref<SpatialMaterial>(memnew(SpatialMaterial)); - Ref<FixedSpatialMaterial> line_material = static_cast<Ref<FixedSpatialMaterial> >(debug_material); - line_material->set_flag(FixedSpatialMaterial::FLAG_UNSHADED, true); + Ref<SpatialMaterial> line_material = static_cast<Ref<SpatialMaterial> >(debug_material); + line_material->set_flag(SpatialMaterial::FLAG_UNSHADED, true); line_material->set_line_width(3.0); line_material->set_albedo(Color(1.0, 0.8, 0.6)); } |