Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts

# Conflicts: # modules/globebrowsing/globebrowsingmodule.cpp # modules/globebrowsing/globebrowsingmodule_lua.inl
2026-04-28 23:09:32 -05:00 · 2021-07-09 15:43:17 +02:00
parent 771aa46fcd 5da4f104e8
commit 16173d7afe
92 changed files with 1015 additions and 490 deletions
@@ -575,6 +575,7 @@ public:

 protected:
    properties::BoolProperty _renderPlaybackInformation;
+    properties::BoolProperty _ignoreRecordedScale;

    enum class RecordedType {
        Camera = 0,