Cleanup: Move Cycles sky model data to util.
authorThomas Dinges <blender@dingto.org>
Sat, 13 Feb 2016 12:40:48 +0000 (13:40 +0100)
committerThomas Dinges <blender@dingto.org>
Sat, 13 Feb 2016 12:41:40 +0000 (13:41 +0100)
intern/cycles/render/CMakeLists.txt
intern/cycles/render/nodes.cpp
intern/cycles/util/CMakeLists.txt
intern/cycles/util/util_sky_model.cpp [moved from intern/cycles/render/sky_model.cpp with 99% similarity]
intern/cycles/util/util_sky_model.h [moved from intern/cycles/render/sky_model.h with 100% similarity]
intern/cycles/util/util_sky_model_data.h [moved from intern/cycles/render/sky_model_data.h with 100% similarity]

index 4e8a1794813122da3fb22abdda2a20108cf8ef17..17ca6ce0f4848622e1f3fdf06365fca66a3ec4bf 100644 (file)
@@ -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
index cb585377f9748048dbdf2a020ffd5948c14b8274..57fb1a78f5bedda81aebacc5dc7cfbb38815087c 100644 (file)
@@ -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"
 
index d4f6a49953bbe24c56eacf3bec43365c11897e10..d0f634b42e15d3d62f22a9f3327a83fc3ca4d96e 100644 (file)
@@ -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
similarity index 99%
rename from intern/cycles/render/sky_model.cpp
rename to intern/cycles/util/util_sky_model.cpp
index f9f14e8ef3b028e6f2780b06a35470576c57fb8b..a53c2ce1bb62431bce7b9af146c0a5867fc13ab6 100644 (file)
@@ -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>