From c81a5f58f8bee9e592963d5e65a62d2a9eba7825 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 19 May 2020 09:26:22 +0200
Subject: [PATCH] OpenSubdiv: Refactor, move topology refiner factory to
 topology folder

---
 intern/opensubdiv/CMakeLists.txt                            | 4 ++--
 .../opensubdiv/internal/topology/topology_refiner_capi.cc   | 2 +-
 .../topology_refiner_factory.cc}                            | 2 +-
 .../topology_refiner_factory.h}                             | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename intern/opensubdiv/internal/{opensubdiv_converter_factory.cc => topology/topology_refiner_factory.cc} (99%)
 rename intern/opensubdiv/internal/{opensubdiv_converter_factory.h => topology/topology_refiner_factory.h} (88%)

diff --git a/intern/opensubdiv/CMakeLists.txt b/intern/opensubdiv/CMakeLists.txt
index 7c73b2ad555..eae09bf5dd6 100644
--- a/intern/opensubdiv/CMakeLists.txt
+++ b/intern/opensubdiv/CMakeLists.txt
@@ -64,17 +64,17 @@ if(WITH_OPENSUBDIV)
 
     # Topology.
     internal/topology/topology_refiner_capi.cc
+    internal/topology/topology_refiner_factory.cc
+    internal/topology/topology_refiner_factory.h
     internal/topology/topology_refiner_impl.cc
     internal/topology/topology_refiner_impl.h
 
     internal/opensubdiv.cc
-    internal/opensubdiv_converter_factory.cc
     internal/opensubdiv_converter_internal.cc
     internal/opensubdiv_evaluator.cc
     internal/opensubdiv_evaluator_internal.cc
     internal/opensubdiv_util.cc
 
-    internal/opensubdiv_converter_factory.h
     internal/opensubdiv_converter_internal.h
     internal/opensubdiv_edge_map.h
     internal/opensubdiv_evaluator_internal.h
diff --git a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc
index ff58ac68866..9bfba259671 100644
--- a/intern/opensubdiv/internal/topology/topology_refiner_capi.cc
+++ b/intern/opensubdiv/internal/topology/topology_refiner_capi.cc
@@ -19,11 +19,11 @@
 #include "opensubdiv_topology_refiner_capi.h"
 
 #include "MEM_guardedalloc.h"
-#include "internal/opensubdiv_converter_factory.h"
 #include "internal/opensubdiv_converter_internal.h"
 #include "internal/opensubdiv_edge_map.h"
 #include "internal/opensubdiv_internal.h"
 #include "internal/opensubdiv_util.h"
+#include "internal/topology/topology_refiner_factory.h"
 #include "internal/topology/topology_refiner_impl.h"
 
 using blender::opensubdiv::vector;
diff --git a/intern/opensubdiv/internal/opensubdiv_converter_factory.cc b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc
similarity index 99%
rename from intern/opensubdiv/internal/opensubdiv_converter_factory.cc
rename to intern/opensubdiv/internal/topology/topology_refiner_factory.cc
index dba2a969062..1f69025782d 100644
--- a/intern/opensubdiv/internal/opensubdiv_converter_factory.cc
+++ b/intern/opensubdiv/internal/topology/topology_refiner_factory.cc
@@ -20,7 +20,7 @@
 #  include <iso646.h>
 #endif
 
-#include "internal/opensubdiv_converter_factory.h"
+#include "internal/topology/topology_refiner_factory.h"
 
 #include <cassert>
 #include <cstdio>
diff --git a/intern/opensubdiv/internal/opensubdiv_converter_factory.h b/intern/opensubdiv/internal/topology/topology_refiner_factory.h
similarity index 88%
rename from intern/opensubdiv/internal/opensubdiv_converter_factory.h
rename to intern/opensubdiv/internal/topology/topology_refiner_factory.h
index 3519d3059b2..4333292f3d1 100644
--- a/intern/opensubdiv/internal/opensubdiv_converter_factory.h
+++ b/intern/opensubdiv/internal/topology/topology_refiner_factory.h
@@ -16,8 +16,8 @@
 //
 // Author: Sergey Sharybin
 
-#ifndef OPENSUBDIV_CONVERTER_FACTORY_H_
-#define OPENSUBDIV_CONVERTER_FACTORY_H_
+#ifndef OPENSUBDIV_TOPOLOGY_REFINER_FACTORY_H_
+#define OPENSUBDIV_TOPOLOGY_REFINER_FACTORY_H_
 
 #ifdef _MSC_VER
 #  include <iso646.h>
@@ -36,4 +36,4 @@ OpenSubdiv::Far::TopologyRefiner *createOSDTopologyRefinerFromConverter(
 }  // namespace opensubdiv
 }  // namespace blender
 
-#endif  // OPENSUBDIV_CONVERTER_FACTORY_H_
+#endif  // OPENSUBDIV_TOPOLOGY_REFINER_FACTORY_H_