diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-07 19:22:34 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-04-07 19:24:37 +0200 |
| commit | efba539f93bc9800589c03d1538843afed56161e (patch) | |
| tree | 5792454e5b589f423258e8f8b154df1c3857197f | |
| parent | 12b84eb9f488d28f3b787fd745fd3dcfa254cab6 (diff) | |
Fix build on older GCC versions
Travis builds would fail with:
./drivers/gles3/rasterizer_storage_gles3.h:1018:19: error: ISO C++ forbids initialization of member 'fixed_fps' [-fpermissive]
| -rw-r--r-- | drivers/gles3/rasterizer_storage_gles3.h | 2 | ||||
| -rw-r--r-- | scene/2d/canvas_item.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index e376c2c0bb..e4e7c048c4 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -1015,7 +1015,7 @@ public: uint32_t cycle_number; - int fixed_fps = 0; + int fixed_fps; bool fractional_delta; float frame_remainder; diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 9ac12de45e..b1db5bbfd8 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -682,9 +682,7 @@ Vector2 CanvasItem::make_canvas_pos_local(const Vector2 &screen_point) const { ERR_FAIL_COND_V(!is_inside_tree(), screen_point); - Transform2D local_matrix = (get_canvas_transform() * - get_global_transform()) - .affine_inverse(); + Transform2D local_matrix = (get_canvas_transform() * get_global_transform()).affine_inverse(); return local_matrix.xform(screen_point); } |