[Bf-blender-cvs] [574781ff1d9] soc-2018-hair-shader: Make use of our customized OSL allocator

[L. E. Segovia]

Commit: 574781ff1d9bcc5abb6ace140f5ecfd97709edb3
Author: L. E. Segovia
Date:   Sat Jun 2 01:43:44 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB574781ff1d9bcc5abb6ace140f5ecfd97709edb3

Make use of our customized OSL allocator

Ref T54796

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

M	intern/cycles/kernel/osl/osl_closures.cpp

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

diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp
index 43d9a37dfbc..ee0e5533b4f 100644
--- a/intern/cycles/kernel/osl/osl_closures.cpp
+++ b/intern/cycles/kernel/osl/osl_closures.cpp
@@ -192,7 +192,6 @@ BSDF_CLOSURE_CLASS_END(PrincipledSheen, principled_sheen)
 class PrincipledHairClosure : public CBSDFClosure {
 public:
 	PrincipledHairBSDF params;
-	float3 unused;
 
 	PrincipledHairBSDF *alloc(ShaderData *sd, int path_flag, float3 weight)
 	{
@@ -207,7 +206,6 @@ public:
 		}
 
 		bsdf->extra = extra;
-		bsdf->extra->geom = params.extra->geom;
 		return bsdf;
 	}
 
@@ -215,20 +213,13 @@ public:
 	{
 		if(!skip(sd, path_flag, LABEL_GLOSSY))
 		{
-			PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)bsdf_alloc_osl(sd, sizeof(PrincipledHairBSDF), weight, &params);
+			PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)alloc(sd, path_flag, weight);
 			if (!bsdf)
 			{
 				return;
 			}
 
-			PrincipledHairExtra *extra = (PrincipledHairExtra*)closure_alloc_extra(sd, sizeof(PrincipledHairExtra));
-			if (!extra)
-			{
-				return;
-			}
-
-			bsdf->extra = extra;
-			sd->flag |= (bsdf && extra) ? bsdf_principled_hair_setup(sd, bsdf) : 0;
+			sd->flag |= (bsdf) ? bsdf_principled_hair_setup(sd, bsdf) : 0;
 		}
 	}
 };