[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59975] branches/soc-2013-dingto/intern/ cycles/kernel: Volume:

[Thomas Dinges]

Revision: 59975
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59975
Author:   dingto
Date:     2013-09-09 23:46:55 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Volume:
* Rename OSL closure and file to reflect recent changes.

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2013-dingto/intern/cycles/kernel/shaders/stdosl.h

Added Paths:
-----------
    branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_isotropic_volume.osl

Removed Paths:
-------------
    branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_henyey_greenstein_volume.osl

Modified: branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_closures.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_closures.cpp	2013-09-09 23:01:49 UTC (rev 59974)
+++ branches/soc-2013-dingto/intern/cycles/kernel/osl/osl_closures.cpp	2013-09-09 23:46:55 UTC (rev 59975)
@@ -233,7 +233,7 @@
 	register_closure(ss, "bssrdf_gaussian", id++,
 		closure_bssrdf_gaussian_extended_params(), closure_bssrdf_gaussian_prepare);
 
-	register_closure(ss, "henyey_greenstein", id++,
+	register_closure(ss, "isotropic", id++,
 		volume_isotropic_params(), volume_isotropic_prepare);
 }
 

Deleted: branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_henyey_greenstein_volume.osl
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_henyey_greenstein_volume.osl	2013-09-09 23:01:49 UTC (rev 59974)
+++ branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_henyey_greenstein_volume.osl	2013-09-09 23:46:55 UTC (rev 59975)
@@ -1,27 +0,0 @@
-/*
- * Copyright 2011-2013 Blender Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-#include "stdosl.h"
-
-shader node_henyey_greenstein_volume(
-	color Color = color(0.8, 0.8, 0.8),
-	float Density = 1.0,
-	float g = 0.0,
-	normal Normal = N,
-	output closure color Volume = 0)
-{
-	Volume = Color * henyey_greenstein(Normal, Density, g);
-}

Copied: branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_isotropic_volume.osl (from rev 59971, branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_henyey_greenstein_volume.osl)
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_isotropic_volume.osl	                        (rev 0)
+++ branches/soc-2013-dingto/intern/cycles/kernel/shaders/node_isotropic_volume.osl	2013-09-09 23:46:55 UTC (rev 59975)
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2011-2013 Blender Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+#include "stdosl.h"
+
+shader node_isotropic_volume(
+	color Color = color(0.8, 0.8, 0.8),
+	float Density = 1.0,
+	float g = 0.0,
+	normal Normal = N,
+	output closure color Volume = 0)
+{
+	Volume = Color * isotropic(Normal, Density, g);
+}

Modified: branches/soc-2013-dingto/intern/cycles/kernel/shaders/stdosl.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/shaders/stdosl.h	2013-09-09 23:01:49 UTC (rev 59974)
+++ branches/soc-2013-dingto/intern/cycles/kernel/shaders/stdosl.h	2013-09-09 23:46:55 UTC (rev 59975)
@@ -469,7 +469,7 @@
 closure color bssrdf_gaussian(normal N, vector radius, float texture_blur) BUILTIN;
 
 // Volume
-closure color henyey_greenstein(normal N, float Density, float g) BUILTIN;
+closure color isotropic(normal N, float Density, float g) BUILTIN;
 
 // Backwards compatibility
 closure color bssrdf_cubic(normal N, vector radius) BUILTIN;