[Bf-blender-cvs] [0ddbc62b37b] cycles-x: Cleanup: Follow naming convention for private members in Cycles X

[Sergey Sharybin]

Commit: 0ddbc62b37b2e20e4bf8bc85a0c3c23e3bbb69e7
Author: Sergey Sharybin
Date:   Fri May 14 11:38:14 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB0ddbc62b37b2e20e4bf8bc85a0c3c23e3bbb69e7

Cleanup: Follow naming convention for private members in Cycles X

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

M	intern/cycles/render/film.cpp
M	intern/cycles/render/film.h

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

diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp
index 6381ae30994..de29a12b159 100644
--- a/intern/cycles/render/film.cpp
+++ b/intern/cycles/render/film.cpp
@@ -133,10 +133,10 @@ NODE_DEFINE(Film)
   return type;
 }
 
-Film::Film() : Node(get_node_type())
+Film::Film() : Node(get_node_type()), filter_table_offset_(TABLE_OFFSET_INVALID)
 {
+
   use_light_visibility = false;
-  filter_table_offset = TABLE_OFFSET_INVALID;
   cryptomatte_passes = CRYPT_NONE;
   display_pass = PASS_COMBINED;
   show_active_pixels = false;
@@ -432,9 +432,9 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 
   /* update filter table */
   vector<float> table = filter_table(filter_type, filter_width);
-  scene->lookup_tables->remove_table(&filter_table_offset);
-  filter_table_offset = scene->lookup_tables->add_table(dscene, table);
-  kfilm->filter_table_offset = (int)filter_table_offset;
+  scene->lookup_tables->remove_table(&filter_table_offset_);
+  filter_table_offset_ = scene->lookup_tables->add_table(dscene, table);
+  kfilm->filter_table_offset = (int)filter_table_offset_;
 
   /* mist pass parameters */
   kfilm->mist_start = mist_start;
@@ -449,7 +449,7 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene)
 
 void Film::device_free(Device * /*device*/, DeviceScene * /*dscene*/, Scene *scene)
 {
-  scene->lookup_tables->remove_table(&filter_table_offset);
+  scene->lookup_tables->remove_table(&filter_table_offset_);
 }
 
 void Film::assign_and_tag_passes_update(Scene *scene, const vector<Pass> &passes)
diff --git a/intern/cycles/render/film.h b/intern/cycles/render/film.h
index 3085ce9379d..77b5c39259f 100644
--- a/intern/cycles/render/film.h
+++ b/intern/cycles/render/film.h
@@ -61,7 +61,7 @@ class Film : public Node {
   NODE_SOCKET_API(int, cryptomatte_depth)
 
  private:
-  size_t filter_table_offset;
+  size_t filter_table_offset_;
 
  public:
   Film();