godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on older GCC versions

Browse Source 
Travis builds would fail with:
./drivers/gles3/rasterizer_storage_gles3.h:1018:19: error: ISO C++ forbids initialization of member 'fixed_fps' [-fpermissive]
This commit is contained in:
Rémi Verschelde 2017-04-07 19:22:34 +02:00
parent 12b84eb9f4
commit efba539f93
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gles3/rasterizer_storage_gles3.h
View File

@ -1015,7 +1015,7 @@ public:
uint32_t cycle_number;
int fixed_fps = 0;
int fixed_fps;
bool fractional_delta;
float frame_remainder;

4
scene/2d/canvas_item.cpp
View File

@ -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);
}