[Bf-blender-cvs] [6c96535] master: Code Cleanup: use static for sky_model_data.h

[Campbell Barton]

Commit: 6c96535fd887c96cd013812d53085b28a5203d5a
Author: Campbell Barton
Date:   Fri Dec 13 04:16:57 2013 +1100
http://developer.blender.org/rB6c96535fd887c96cd013812d53085b28a5203d5a

Code Cleanup: use static for sky_model_data.h

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

M	intern/cycles/render/sky_model.cpp
M	intern/cycles/render/sky_model_data.h

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

diff --git a/intern/cycles/render/sky_model.cpp b/intern/cycles/render/sky_model.cpp
index 3bfb5e1..6f250c0 100644
--- a/intern/cycles/render/sky_model.cpp
+++ b/intern/cycles/render/sky_model.cpp
@@ -132,20 +132,20 @@ CCL_NAMESPACE_BEGIN
 
 // internal definitions
 
-typedef double *ArHosekSkyModel_Dataset;
-typedef double *ArHosekSkyModel_Radiance_Dataset;
+typedef const double *ArHosekSkyModel_Dataset;
+typedef const double *ArHosekSkyModel_Radiance_Dataset;
 
 // internal functions
 
 static void ArHosekSkyModel_CookConfiguration(
-        ArHosekSkyModel_Dataset       dataset, 
+        ArHosekSkyModel_Dataset       dataset,
         ArHosekSkyModelConfiguration  config, 
         double                        turbidity, 
         double                        albedo, 
         double                        solar_elevation
         )
 {
-    double  * elev_matrix;
+    const double  * elev_matrix;
 
     int     int_turbidity = (int)turbidity;
     double  turbidity_rem = turbidity - (double)int_turbidity;
@@ -226,7 +226,7 @@ static double ArHosekSkyModel_CookRadianceConfiguration(
         double                            solar_elevation
         )
 {
-    double* elev_matrix;
+    const double* elev_matrix;
 
     int int_turbidity = (int)turbidity;
     double turbidity_rem = turbidity - (double)int_turbidity;
diff --git a/intern/cycles/render/sky_model_data.h b/intern/cycles/render/sky_model_data.h
index a292eea..4171bd1 100644
--- a/intern/cycles/render/sky_model_data.h
+++ b/intern/cycles/render/sky_model_data.h
@@ -103,7 +103,7 @@ the model.
 
 // Uses Sep 9 pattern / Aug 23 mean dataset
 
-double datasetXYZ1[] = 
+static const double datasetXYZ1[] =
 {
 	// albedo 0, turbidity 1
 	-1.117001e+000,
@@ -1207,7 +1207,7 @@ double datasetXYZ1[] =
 	6.232887e-001,
 };
 
-double datasetXYZRad1[] = 
+static const double datasetXYZRad1[] =
 {
 	// albedo 0, turbidity 1
 	1.560219e+000,
@@ -1351,7 +1351,7 @@ double datasetXYZRad1[] =
 	2.523432e+001,
 };
 
-double datasetXYZ2[] = 
+static const double datasetXYZ2[] =
 {
 	// albedo 0, turbidity 1
 	-1.127942e+000,
@@ -2455,7 +2455,7 @@ double datasetXYZ2[] =
 	6.118645e-001,
 };
 
-double datasetXYZRad2[] = 
+static const double datasetXYZRad2[] =
 {
 	// albedo 0, turbidity 1
 	1.632341e+000,
@@ -2599,7 +2599,7 @@ double datasetXYZRad2[] =
 	2.641780e+001,
 };
 
-double datasetXYZ3[] = 
+static const double datasetXYZ3[] =
 {
 	// albedo 0, turbidity 1
 	-1.310023e+000,
@@ -3703,7 +3703,7 @@ double datasetXYZ3[] =
 	6.791814e-001,
 };
 
-double datasetXYZRad3[] = 
+static const double datasetXYZRad3[] =
 {
 	// albedo 0, turbidity 1
 	1.168084e+000,
@@ -3849,14 +3849,14 @@ double datasetXYZRad3[] =
 
 
 
-double* datasetsXYZ[] =
+static const double* datasetsXYZ[] =
 {
 	datasetXYZ1,
 	datasetXYZ2,
 	datasetXYZ3
 };
 
-double* datasetsXYZRad[] =
+static const double* datasetsXYZRad[] =
 {
 	datasetXYZRad1,
 	datasetXYZRad2,