maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #30602 from n-k-chilagani/first_time

Browse source 
Fixed Make 3D viewport locked nodes unselectable as in 2D viewport
This commit is contained in:
Rémi Verschelde 2019-07-16 11:35:16 +02:00 committed by GitHub
parent df62bfdd49 600c153076
commit 22c843b0c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
editor/plugins/spatial_editor_plugin.cpp
View file

@ -283,7 +283,8 @@ void SpatialEditorViewport::_select_clicked(bool p_append, bool p_single) {
node = node->get_parent();
}
_select(selected, clicked_wants_append, true);
if (!_is_node_locked(selected))
_select(selected, clicked_wants_append, true);
}
void SpatialEditorViewport::_select(Node *p_node, bool p_append, bool p_single) {
@ -513,7 +514,7 @@ void SpatialEditorViewport::_select_region() {
for (int i = 0; i < instances.size(); i++) {
Spatial *sp = Object::cast_to<Spatial>(ObjectDB::get_instance(instances[i]));
if (!sp)
if (!sp && _is_node_locked(sp))
continue;
Node *item = Object::cast_to<Node>(sp);
@ -536,6 +537,8 @@ void SpatialEditorViewport::_select_region() {
if (selected.find(item) != -1) continue;
if (_is_node_locked(Object::cast_to<Spatial>(item))) continue;
Ref<EditorSpatialGizmo> seg = sp->get_gizmo();
if (!seg.is_valid())
@ -833,7 +836,9 @@ void SpatialEditorViewport::_surface_focus_exit() {
view_menu->set_disable_shortcuts(true);
}
bool SpatialEditorViewport ::_is_node_locked(const Node *p_node) {
return p_node->has_meta("_edit_lock_") && p_node->get_meta("_edit_lock_");
}
void SpatialEditorViewport::_list_select(Ref<InputEventMouseButton> b) {
_find_items_at_pos(b->get_position(), clicked_includes_current, selection_results, b->get_shift());

2
editor/plugins/spatial_editor_plugin.h
View file

@ -364,7 +364,7 @@ private:
Camera *preview;
bool previewing_cinema;
bool _is_node_locked(const Node *p_node);
void _preview_exited_scene();
void _toggle_camera_preview(bool);
void _toggle_cinema_preview(bool);