[Bf-blender-cvs] [e2a1f3a4e1f] cycles_procedural_api: avoid making Object a friend of Mesh

[Kévin Dietrich]

Commit: e2a1f3a4e1f16ddc058e4dd2e4e6289da4dd3ad5
Author: Kévin Dietrich
Date:   Wed Nov 4 11:17:38 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rBe2a1f3a4e1f16ddc058e4dd2e4e6289da4dd3ad5

avoid making Object a friend of Mesh

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

M	intern/cycles/render/mesh.h
M	intern/cycles/render/object.cpp

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

diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h
index 177c206881c..6630dcd8a35 100644
--- a/intern/cycles/render/mesh.h
+++ b/intern/cycles/render/mesh.h
@@ -191,7 +191,6 @@ class Mesh : public Geometry {
   friend class DiagSplit;
   friend class EdgeDice;
   friend class GeometryManager;
-  friend class Object;
   friend class ObjectManager;
 
   SubdParams *subd_params = nullptr;
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 82895dee6a5..105e968c265 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -291,7 +291,7 @@ float Object::compute_volume_step_size() const
   /* Compute step rate from shaders. */
   float step_rate = FLT_MAX;
 
-  foreach (Node *node, mesh->used_shaders) {
+  foreach (Node *node, mesh->get_used_shaders()) {
     Shader *shader = static_cast<Shader *>(node);
     if (shader->has_volume) {
       if ((shader->get_heterogeneous_volume() && shader->has_volume_spatial_varying) ||