Merge branch 'tmj-dev'

2026-07-18 03:09:18 +02:00 · 2018-02-16 15:25:53 +01:00
parent 910b0b1dd6 2dd82bf71b
commit 61836eb2e4
113 changed files with 4617 additions and 4057 deletions
--- a/Button.cpp
+++ b/Button.cpp
@@ -105,7 +105,7 @@ TButton::model_offset() const {

    return (
        submodel != nullptr ?
-            submodel->offset( 2.5f ) :
+            submodel->offset( std::numeric_limits<float>::max() ) :
            glm::vec3() );
 }