[Bf-blender-cvs] [ebae2d6aa2e] uv_unwrapping_slim_algorithm: UV Unwrapping SLIM: renaming files and moving headers

Aurel Gruber noreply at git.blender.org
Tue Mar 14 09:43:10 CET 2017


Commit: ebae2d6aa2eb70e7116df9aa2924468c06db50d8
Author: Aurel Gruber
Date:   Thu Mar 9 13:56:18 2017 +0100
Branches: uv_unwrapping_slim_algorithm
https://developer.blender.org/rBebae2d6aa2eb70e7116df9aa2924468c06db50d8

UV Unwrapping SLIM: renaming files and moving headers

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

M	intern/slim/CMakeLists.txt
R100	intern/slim/src/area_compensation.h	intern/slim/area_compensation.h
R098	intern/slim/src/geometry_data_retrieval.h	intern/slim/geometry_data_retrieval.h
R100	intern/slim/src/least_squares_relocator.h	intern/slim/least_squares_relocator.h
R100	intern/slim/src/matrix_transfer.h	intern/slim/matrix_transfer.h
R100	intern/slim/src/Slim.h	intern/slim/slim.h
R100	intern/slim/src/slim_parametrizer.h	intern/slim/slim_parametrizer.h
R100	intern/slim/src/Slim.cpp	intern/slim/src/slim.cpp
R096	intern/slim/src/slim_C_interface.cpp	intern/slim/src/slim_c_interface.cpp
R087	intern/slim/src/slim_C_interface.h	intern/slim/src/slim_c_interface.h
M	intern/slim/src/slim_parametrizer.cpp
R099	intern/slim/src/UVInitializer.cpp	intern/slim/src/uv_initializer.cpp
R100	intern/slim/src/UVInitializer.h	intern/slim/uv_initializer.h
M	source/blender/editors/uvedit/uvedit_parametrizer.h
M	source/blender/editors/uvedit/uvedit_unwrap_ops.c

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

diff --git a/intern/slim/CMakeLists.txt b/intern/slim/CMakeLists.txt
index d8cdc0fcfb3..ae133525a97 100644
--- a/intern/slim/CMakeLists.txt
+++ b/intern/slim/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 set(INC
+  ./
   ext/libigl_extract
   ../../source/blender/editors/uvedit
   ../../source/blender/makesdna
@@ -12,22 +13,23 @@ set(INC_SYS
 )
 
 set(SRC
+  matrix_transfer.h
+  slim.h
+  slim_parametrizer.h
+  uv_initializer.h
+  slim_c_interface.h
+  area_compensation.h
+  least_squares_relocator.h
+  geometry_data_retrieval.h
+
   src/slim.cpp
   src/slim_parametrizer.cpp
-  src/UVInitializer.cpp
-  src/slim_C_interface.cpp
+  src/uv_initializer.cpp
+  src/slim_c_interface.cpp
   src/area_compensation.cpp
   src/least_squares_relocator.cpp
   src/geometry_data_retrieval.cpp
 
-  src/matrix_transfer.h
-  src/slim.h
-  src/slim_parametrizer.h
-  src/UVInitializer.h
-  src/slim_C_interface.h
-  src/area_compensation.h
-  src/least_squares_relocator.h
-  src/geometry_data_retrieval.h
 
   ${ADDITIONAL_SOURCES}
 )
diff --git a/intern/slim/src/area_compensation.h b/intern/slim/area_compensation.h
similarity index 100%
rename from intern/slim/src/area_compensation.h
rename to intern/slim/area_compensation.h
diff --git a/intern/slim/src/geometry_data_retrieval.h b/intern/slim/geometry_data_retrieval.h
similarity index 98%
rename from intern/slim/src/geometry_data_retrieval.h
rename to intern/slim/geometry_data_retrieval.h
index fc0028187a4..8f87c9f3aca 100644
--- a/intern/slim/src/geometry_data_retrieval.h
+++ b/intern/slim/geometry_data_retrieval.h
@@ -14,7 +14,7 @@
 
 #include "matrix_transfer.h"
 #include "slim.h"
-#include "UVInitializer.h"
+#include "uv_initializer.h"
 
 using namespace Eigen;
 using namespace igl;
diff --git a/intern/slim/src/least_squares_relocator.h b/intern/slim/least_squares_relocator.h
similarity index 100%
rename from intern/slim/src/least_squares_relocator.h
rename to intern/slim/least_squares_relocator.h
diff --git a/intern/slim/src/matrix_transfer.h b/intern/slim/matrix_transfer.h
similarity index 100%
rename from intern/slim/src/matrix_transfer.h
rename to intern/slim/matrix_transfer.h
diff --git a/intern/slim/src/Slim.h b/intern/slim/slim.h
similarity index 100%
rename from intern/slim/src/Slim.h
rename to intern/slim/slim.h
diff --git a/intern/slim/src/slim_parametrizer.h b/intern/slim/slim_parametrizer.h
similarity index 100%
rename from intern/slim/src/slim_parametrizer.h
rename to intern/slim/slim_parametrizer.h
diff --git a/intern/slim/src/Slim.cpp b/intern/slim/src/slim.cpp
similarity index 100%
rename from intern/slim/src/Slim.cpp
rename to intern/slim/src/slim.cpp
diff --git a/intern/slim/src/slim_C_interface.cpp b/intern/slim/src/slim_c_interface.cpp
similarity index 96%
rename from intern/slim/src/slim_C_interface.cpp
rename to intern/slim/src/slim_c_interface.cpp
index 4ce3f6464fd..cbd79fd0fd0 100644
--- a/intern/slim/src/slim_C_interface.cpp
+++ b/intern/slim/src/slim_c_interface.cpp
@@ -1,5 +1,5 @@
 //
-//  slim_C_interface.cpp
+//  slim_c_interface.cpp
 //  Blender
 //
 //  Created by Aurel Gruber on 30.11.16.
@@ -8,7 +8,7 @@
 
 #include <Eigen/Dense>
 
-#include "slim_C_interface.h"
+#include "slim_c_interface.h"
 #include "slim_parametrizer.h"
 #include "slim.h"
 
diff --git a/intern/slim/src/slim_C_interface.h b/intern/slim/src/slim_c_interface.h
similarity index 87%
rename from intern/slim/src/slim_C_interface.h
rename to intern/slim/src/slim_c_interface.h
index e9907356d05..3e24081a172 100644
--- a/intern/slim/src/slim_C_interface.h
+++ b/intern/slim/src/slim_c_interface.h
@@ -1,13 +1,13 @@
 //
-//  slim_C_interface.hpp
+//  slim_c_interface.h
 //  Blender
 //
 //  Created by Aurel Gruber on 30.11.16.
 //
 //
 
-#ifndef slim_C_interface_hpp
-#define slim_C_interface_hpp
+#ifndef slim_c_interface_h
+#define slim_c_interface_h
 
 #include "matrix_transfer.h"
 
diff --git a/intern/slim/src/slim_parametrizer.cpp b/intern/slim/src/slim_parametrizer.cpp
index be6feffc401..d49f34091bc 100644
--- a/intern/slim/src/slim_parametrizer.cpp
+++ b/intern/slim/src/slim_parametrizer.cpp
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "slim.h"
-#include "UVInitializer.h"
+#include "uv_initializer.h"
 #include "area_compensation.h"
 #include "least_squares_relocator.h"
 #include "geometry_data_retrieval.h"
diff --git a/intern/slim/src/UVInitializer.cpp b/intern/slim/src/uv_initializer.cpp
similarity index 99%
rename from intern/slim/src/UVInitializer.cpp
rename to intern/slim/src/uv_initializer.cpp
index 34513f31957..80ba07cb148 100644
--- a/intern/slim/src/UVInitializer.cpp
+++ b/intern/slim/src/uv_initializer.cpp
@@ -6,7 +6,7 @@
 //
 //
 
-#include "UVInitializer.h"
+#include "uv_initializer.h"
 #include<Eigen/SparseLU>
 
 #include "igl/Timer.h"
diff --git a/intern/slim/src/UVInitializer.h b/intern/slim/uv_initializer.h
similarity index 100%
rename from intern/slim/src/UVInitializer.h
rename to intern/slim/uv_initializer.h
diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h
index abfc4a01620..7e0c5b12c23 100644
--- a/source/blender/editors/uvedit/uvedit_parametrizer.h
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.h
@@ -41,7 +41,7 @@ extern "C" {
 #include "BLI_sys_types.h" // for intptr_t support
 
 #include "matrix_transfer.h" // for SLIM
-#include "slim_C_interface.h"
+#include "slim_c_interface.h"
 
 typedef void ParamHandle;	/* handle to a set of charts */
 typedef intptr_t ParamKey;		/* (hash) key for identifying verts and faces */
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index db56fc93992..cb5bf632089 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -83,7 +83,7 @@
 #include "uvedit_parametrizer.h"
 
 #include "matrix_transfer.h"
-#include "slim_C_interface.h"
+#include "slim_c_interface.h"
 
 #define max(x, y) (((x) > (y)) ? (x) : (y))
 #define min(x, y) (((x) < (y)) ? (x) : (y))




More information about the Bf-blender-cvs mailing list