diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-22 20:11:26 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-22 20:17:22 +0300 |
| commit | f7c28a66e282eb9eb66bd02ccfe985beb6cb6f90 (patch) | |
| tree | cea0ed8514901c819572c06066f81eac94d7c780 /intern/cycles/util | |
| parent | 2f978656ab7d076706ef458ddd7674a6f653cad8 (diff) | |
Fix Cycles compile errors with GCC due to double promotion as errors.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_progress.h | 12 | ||||
| -rw-r--r-- | intern/cycles/util/util_sky_model.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_transform.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_view.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h index 0b35142ddb3..4ae1d61dd17 100644 --- a/intern/cycles/util/util_progress.h +++ b/intern/cycles/util/util_progress.h @@ -37,9 +37,9 @@ public: tile = 0; sample = 0; start_time = time_dt(); - total_time = 0.0f; - render_time = 0.0f; - tile_time = 0.0f; + total_time = 0.0; + render_time = 0.0; + tile_time = 0.0; status = "Initializing"; substatus = ""; sync_status = ""; @@ -75,9 +75,9 @@ public: sample = 0; start_time = time_dt(); render_start_time = time_dt(); - total_time = 0.0f; - render_time = 0.0f; - tile_time = 0.0f; + total_time = 0.0; + render_time = 0.0; + tile_time = 0.0; status = "Initializing"; substatus = ""; sync_status = ""; diff --git a/intern/cycles/util/util_sky_model.cpp b/intern/cycles/util/util_sky_model.cpp index a53c2ce1bb6..5730986cc4f 100644 --- a/intern/cycles/util/util_sky_model.cpp +++ b/intern/cycles/util/util_sky_model.cpp @@ -301,7 +301,7 @@ double arhosekskymodel_radiance(ArHosekSkyModelState *state, int low_wl = (int)((wavelength - 320.0) / 40.0); if(low_wl < 0 || low_wl >= 11) - return 0.0f; + return 0.0; double interp = fmod((wavelength - 320.0 ) / 40.0, 1.0); diff --git a/intern/cycles/util/util_transform.cpp b/intern/cycles/util/util_transform.cpp index 79e1137d238..2f10540c94e 100644 --- a/intern/cycles/util/util_transform.cpp +++ b/intern/cycles/util/util_transform.cpp @@ -158,7 +158,7 @@ Transform transform_inverse(const Transform& tfm) float4 transform_to_quat(const Transform& tfm) { - double trace = tfm[0][0] + tfm[1][1] + tfm[2][2]; + double trace = (double)(tfm[0][0] + tfm[1][1] + tfm[2][2]); float4 qt; if(trace > 0.0) { diff --git a/intern/cycles/util/util_view.cpp b/intern/cycles/util/util_view.cpp index 4d2adf33a7a..9796a5f896d 100644 --- a/intern/cycles/util/util_view.cpp +++ b/intern/cycles/util/util_view.cpp @@ -222,7 +222,7 @@ static void view_idle(void) glutPostRedisplay(); } - time_sleep(0.1f); + time_sleep(0.1); } void view_main_loop(const char *title, int width, int height, |