Cycles / OSL:
authorThomas Dinges <blender@dingto.org>
Fri, 31 Aug 2012 20:08:55 +0000 (20:08 +0000)
committerThomas Dinges <blender@dingto.org>
Fri, 31 Aug 2012 20:08:55 +0000 (20:08 +0000)
* OSL namespace fixes for osl_shader.cpp.

intern/cycles/kernel/osl/osl_shader.cpp

index 07d21067edd5e2862bb9e3797a4da8c23ac5d82d..80cbbcae234617119aa7f28f46599070c73b4205 100644 (file)
@@ -123,7 +123,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
                        sc.weight = weight;
 
                        switch (prim->category()) {
-                               case ClosurePrimitive::BSDF: {
+                               case OSL::ClosurePrimitive::BSDF: {
                                        if (sd->num_closure == MAX_CLOSURE)
                                                return;
 
@@ -153,7 +153,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
                                        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 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
                                        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 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy,
                                        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 @@ static void flatten_volume_closure_tree(ShaderData *sd,
                        sc.weight = weight;
 
                        switch (prim->category()) {
-                               case ClosurePrimitive::Volume: {
+                               case OSL::ClosurePrimitive::Volume: {
                                        if (sd->num_closure == MAX_CLOSURE)
                                                return;
 
@@ -311,13 +311,13 @@ static void flatten_volume_closure_tree(ShaderData *sd,
                                        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 */
                        }
                }