noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #21707 from JFonS/fix_instanced_selection

Browse Source 
Fix selection of instanced scenes in 3D
This commit is contained in:
Rémi Verschelde
2018-09-05 18:11:56 +02:00
committed by GitHub
parent 2f4912ec69 4a412943d4
commit 8804eb8c06
7 changed files with 34 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/3d/spatial.cpp
+8 -14
View File
@@ -185,10 +185,8 @@ void Spatial::_notification(int p_what) {
if (data.gizmo.is_valid()) {
data.gizmo->create();
if (data.gizmo->can_draw()) {
if (is_visible_in_tree()) {
data.gizmo->redraw();
}
if (is_visible_in_tree()) {
data.gizmo->redraw();
}
data.gizmo->transform();
}
@@ -423,10 +421,8 @@ void Spatial::set_gizmo(const Ref<SpatialGizmo> &p_gizmo) {
if (data.gizmo.is_valid() && is_inside_world()) {
data.gizmo->create();
if (data.gizmo->can_draw()) {
if (is_visible_in_tree()) {
data.gizmo->redraw();
}
if (is_visible_in_tree()) {
data.gizmo->redraw();
}
data.gizmo->transform();
}
@@ -452,12 +448,10 @@ void Spatial::_update_gizmo() {
return;
data.gizmo_dirty = false;
if (data.gizmo.is_valid()) {
if (data.gizmo->can_draw()) {
if (is_visible_in_tree())
data.gizmo->redraw();
else
data.gizmo->clear();
}
if (is_visible_in_tree())
data.gizmo->redraw();
else
data.gizmo->clear();
}
#endif
}
scene/3d/spatial.h
-1
View File
@@ -48,7 +48,6 @@ public:
virtual void clear() = 0;
virtual void redraw() = 0;
virtual void free() = 0;
virtual bool can_draw() const = 0;
SpatialGizmo();
virtual ~SpatialGizmo() {}