[Bf-blender-cvs] [8d0e620bafe] cycles_procedural_api: quiet introduced warnings

[Kévin Dietrich]

Commit: 8d0e620bafef3f69b190aca8c67fc0cb3ef13fdf
Author: Kévin Dietrich
Date:   Fri Oct 2 05:10:35 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB8d0e620bafef3f69b190aca8c67fc0cb3ef13fdf

quiet introduced warnings

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

M	intern/cycles/device/device_optix.cpp
M	intern/cycles/render/geometry.cpp

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

diff --git a/intern/cycles/device/device_optix.cpp b/intern/cycles/device/device_optix.cpp
index a868b46144c..45d332b9501 100644
--- a/intern/cycles/device/device_optix.cpp
+++ b/intern/cycles/device/device_optix.cpp
@@ -1260,7 +1260,9 @@ class OptiXDevice : public CUDADevice {
 
           for (size_t j = 0, i = 0; j < hair->num_curves(); ++j) {
             const Hair::Curve curve = hair->get_curve(j);
+#  if OPTIX_ABI_VERSION >= 36
             const array<float> &curve_radius = hair->get_curve_radius();
+#  endif
 
             for (int segment = 0; segment < curve.num_segments(); ++segment, ++i) {
 #  if OPTIX_ABI_VERSION >= 36
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 980ec607b2c..f7ccf858e09 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -58,7 +58,7 @@ NODE_ABSTRACT_DEFINE(Geometry)
 }
 
 Geometry::Geometry(const NodeType *node_type, const Type type)
-    : Node(node_type), geometry_type(type), attributes(this, ATTR_PRIM_GEOMETRY)
+    : Node(node_type), attributes(this, ATTR_PRIM_GEOMETRY), geometry_type(type)
 {
   need_update_rebuild = false;