[Bf-blender-cvs] [d39e7fc7082] cycles_embree: Cycles: removed use of constexpr to stay compatible with pre-C++11 compilers

Stefan Werner noreply at git.blender.org
Sun Nov 26 23:11:32 CET 2017


Commit: d39e7fc7082fd9efc65531c3435019ec2b4ec891
Author: Stefan Werner
Date:   Fri Oct 20 15:52:34 2017 +0200
Branches: cycles_embree
https://developer.blender.org/rBd39e7fc7082fd9efc65531c3435019ec2b4ec891

Cycles: removed use of constexpr to stay compatible with pre-C++11 compilers

===================================================================

M	intern/cycles/bvh/bvh_embree.cpp

===================================================================

diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp
index 550dd5ccc8d..a21f5efeb11 100644
--- a/intern/cycles/bvh/bvh_embree.cpp
+++ b/intern/cycles/bvh/bvh_embree.cpp
@@ -559,7 +559,7 @@ void BVHEmbree::update_curve_vertex_buffer(unsigned geom_id, const Mesh* mesh)
 					if(c.num_segments() > 0) {
 						/* Create Embree's cubic splines that equal the cardinal splines that cycles uses */
 						//static float fc = 1.0f / ((0.29f - 1.0f) * 6.0f);
-						constexpr float fc = -0.2347417840375f;
+						const float fc = -0.2347417840375f;
 						rtc_verts[0] = float3_to_float4(verts[0]);
 						rtc_verts[0].w = curve_radius[0];
 						rtc_verts[1] = float3_to_float4(-fc * (verts[1] - verts[0]) + verts[0]);



More information about the Bf-blender-cvs mailing list