[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50302] trunk/blender/intern/cycles/kernel /osl/osl_shader.cpp: Cycles / OSL:

[Thomas Dinges]

Revision: 50302
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50302
Author:   dingto
Date:     2012-08-31 20:08:55 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
Cycles / OSL:
* OSL namespace fixes for osl_shader.cpp. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp

Modified: trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2012-08-31 19:59:50 UTC (rev 50301)
+++ trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2012-08-31 20:08:55 UTC (rev 50302)
@@ -123,7 +123,7 @@
 			sc.weight = weight;
 
 			switch (prim->category()) {
-				case ClosurePrimitive::BSDF: {
+				case OSL::ClosurePrimitive::BSDF: {
 					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
@@ -153,7 +153,7 @@
 					sd->closure[sd->num_closure++] = sc;
 					break;
 				}
-				case ClosurePrimitive::Emissive: {
+				case OSL::ClosurePrimitive::Emissive: {
 					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
@@ -169,7 +169,7 @@
 					sd->closure[sd->num_closure++] = sc;
 					break;
 				}
-				case ClosurePrimitive::Holdout:
+				case OSL::ClosurePrimitive::Holdout:
 					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
@@ -178,11 +178,11 @@
 					sd->flag |= SD_HOLDOUT;
 					sd->closure[sd->num_closure++] = sc;
 					break;
-				case ClosurePrimitive::BSSRDF:
-				case ClosurePrimitive::Debug:
+				case OSL::ClosurePrimitive::BSSRDF:
+				case OSL::ClosurePrimitive::Debug:
 					break; /* not implemented */
-				case ClosurePrimitive::Background:
-				case ClosurePrimitive::Volume:
+				case OSL::ClosurePrimitive::Background:
+				case OSL::ClosurePrimitive::Volume:
 					break; /* not relevant */
 			}
 		}
@@ -297,7 +297,7 @@
 			sc.weight = weight;
 
 			switch (prim->category()) {
-				case ClosurePrimitive::Volume: {
+				case OSL::ClosurePrimitive::Volume: {
 					if (sd->num_closure == MAX_CLOSURE)
 						return;
 
@@ -311,13 +311,13 @@
 					sd->closure[sd->num_closure++] = sc;
 					break;
 				}
-				case ClosurePrimitive::Holdout:
-				case ClosurePrimitive::Debug:
+				case OSL::ClosurePrimitive::Holdout:
+				case OSL::ClosurePrimitive::Debug:
 					break; /* not implemented */
-				case ClosurePrimitive::Background:
-				case ClosurePrimitive::BSDF:
-				case ClosurePrimitive::Emissive:
-				case ClosurePrimitive::BSSRDF:
+				case OSL::ClosurePrimitive::Background:
+				case OSL::ClosurePrimitive::BSDF:
+				case OSL::ClosurePrimitive::Emissive:
+				case OSL::ClosurePrimitive::BSSRDF:
 					break; /* not relevant */
 			}
 		}