summaryrefslogtreecommitdiffstats
path: root/scene/3d/camera.h
diff options
context:
space:
mode:
authorPedro J. Estébanez <pedrojrulez@gmail.com>2019-03-10 04:59:52 +0100
committerPedro J. Estébanez <pedrojrulez@gmail.com>2019-03-30 00:25:26 +0100
commite3fc5fb1dba48b300d31eb519a7ff4d8f535a9d0 (patch)
treedda6e90e055f5e1e5f951f422556dc798ceb18df /scene/3d/camera.h
parent805eec7643a4b2a8b8ed521e213ae8189acaba40 (diff)
downloadredot-engine-e3fc5fb1dba48b300d31eb519a7ff4d8f535a9d0.tar.gz
Fix Viewport and Camera issues
1. Consider 'own_world' as well as 'world' to stop propagating enter/exit world notifications. 2. Clean & fix handling of camera currency. This fixes some random crashes and error logs in the editor; namely - when enabling/disabling own world in a Viewport; - when switching back from a subscene displayed into a main scene's Viewport; - when exiting the editor after any of them; - memory corruption (can that explain certain other seemingly unrelated crash reports?). This also fixes situations where a Viewport and its main Camera get out of sync about which World is relevant to them.
Diffstat (limited to 'scene/3d/camera.h')
-rw-r--r--scene/3d/camera.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/scene/3d/camera.h b/scene/3d/camera.h
index a531324a85..95f14c8327 100644
--- a/scene/3d/camera.h
+++ b/scene/3d/camera.h
@@ -63,6 +63,7 @@ public:
private:
bool force_change;
bool current;
+ Viewport *viewport;
Projection mode;