[Bf-blender-cvs] [6a593ab] master: Cleanup: Move Cycles sky model data to util.

[Thomas Dinges]

Commit: 6a593aba44a799a0b7981b4fb2a699b1cdd44fd2
Author: Thomas Dinges
Date:   Sat Feb 13 13:40:48 2016 +0100
Branches: master
https://developer.blender.org/rB6a593aba44a799a0b7981b4fb2a699b1cdd44fd2

Cleanup: Move Cycles sky model data to util.

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

M	intern/cycles/render/CMakeLists.txt
M	intern/cycles/render/nodes.cpp
D	intern/cycles/render/sky_model.cpp
D	intern/cycles/render/sky_model.h
D	intern/cycles/render/sky_model_data.h
M	intern/cycles/util/CMakeLists.txt
A	intern/cycles/util/util_sky_model.cpp
A	intern/cycles/util/util_sky_model.h
A	intern/cycles/util/util_sky_model_data.h

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

diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index 4e8a179..17ca6ce 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -35,7 +35,6 @@ set(SRC
 	scene.cpp
 	session.cpp
 	shader.cpp
-	sky_model.cpp
 	sobol.cpp
 	svm.cpp
 	tables.cpp
@@ -62,8 +61,6 @@ set(SRC_HEADERS
 	scene.h
 	session.h
 	shader.h
-	sky_model.h
-	sky_model_data.h
 	sobol.h
 	svm.h
 	tables.h
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index cb58537..57fb1a7 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -21,8 +21,8 @@
 #include "svm.h"
 #include "svm_math_util.h"
 #include "osl.h"
-#include "sky_model.h"
 
+#include "util_sky_model.h"
 #include "util_foreach.h"
 #include "util_transform.h"
 
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index d4f6a49..d0f634b 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -62,6 +62,9 @@ set(SRC_HEADERS
 	util_queue.h
 	util_set.h
 	util_simd.h
+	util_sky_model.cpp
+	util_sky_model.h
+	util_sky_model_data.h
 	util_sseb.h
 	util_ssef.h
 	util_ssei.h
diff --git a/intern/cycles/render/sky_model.cpp b/intern/cycles/util/util_sky_model.cpp
similarity index 99%
rename from intern/cycles/render/sky_model.cpp
rename to intern/cycles/util/util_sky_model.cpp
index f9f14e8..a53c2ce 100644
--- a/intern/cycles/render/sky_model.cpp
+++ b/intern/cycles/util/util_sky_model.cpp
@@ -97,8 +97,8 @@ All instructions on how to use this code are in the accompanying header file.
 
 */
 
-#include "sky_model.h"
-#include "sky_model_data.h"
+#include "util_sky_model.h"
+#include "util_sky_model_data.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/intern/cycles/render/sky_model.h b/intern/cycles/util/util_sky_model.h
similarity index 100%
rename from intern/cycles/render/sky_model.h
rename to intern/cycles/util/util_sky_model.h
diff --git a/intern/cycles/render/sky_model_data.h b/intern/cycles/util/util_sky_model_data.h
similarity index 100%
rename from intern/cycles/render/sky_model_data.h
rename to intern/cycles/util/util_sky_model_data.h