[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60246] branches/soc-2013-dingto: Merged revision(s) 60244-60245 from trunk/blender into soc-2013-dingto.

[Thomas Dinges]

Revision: 60246
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60246
Author:   dingto
Date:     2013-09-19 23:57:34 +0000 (Thu, 19 Sep 2013)
Log Message:
-----------
Merged revision(s) 60244-60245 from trunk/blender into soc-2013-dingto.

Note: 60243 was merged in r60244 already, log info was wrong. 

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60244

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_hair.h

Property Changed:
----------------
    branches/soc-2013-dingto/


Property changes on: branches/soc-2013-dingto
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60243
   + /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57315-57365,57369-58448,58450,58452-58770,58779,58783-58855,58857,58859-59032,59035-59602,59604-60245

Modified: branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_hair.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_hair.h	2013-09-19 23:54:16 UTC (rev 60245)
+++ branches/soc-2013-dingto/intern/cycles/kernel/closure/bsdf_hair.h	2013-09-19 23:57:34 UTC (rev 60246)
@@ -47,16 +47,16 @@
 __device int bsdf_hair_reflection_setup(ShaderClosure *sc)
 {
 	sc->type = CLOSURE_BSDF_HAIR_REFLECTION_ID;
-	sc->data0 = clamp(sc->data0, 0.001f,1.0f);
-	sc->data1 = clamp(sc->data1, 0.001f,1.0f);
+	sc->data0 = clamp(sc->data0, 0.001f, 1.0f);
+	sc->data1 = clamp(sc->data1, 0.001f, 1.0f);
 	return SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSDF_GLOSSY;
 }
 
 __device int bsdf_hair_transmission_setup(ShaderClosure *sc)
 {
 	sc->type = CLOSURE_BSDF_HAIR_TRANSMISSION_ID;
-	sc->data0 = clamp(sc->data0, 0.001f,1.0f);
-	sc->data1 = clamp(sc->data1, 0.001f,1.0f);
+	sc->data0 = clamp(sc->data0, 0.001f, 1.0f);
+	sc->data1 = clamp(sc->data1, 0.001f, 1.0f);
 	return SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSDF_GLOSSY;
 }
 
@@ -67,7 +67,7 @@
 	float3 Tg = sc->T;
 #else
 	float offset = 0.0f;
-	float3 Tg = make_float3(1.0f,0.0f,0.0f);
+	float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
 #endif
 	float roughness1 = sc->data0;
 	float roughness2 = sc->data1;
@@ -124,7 +124,7 @@
 	float3 Tg = sc->T;
 #else
 	float offset = 0.0f;
-	float3 Tg = make_float3(1.0f,0.0f,0.0f);
+	float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
 #endif
 	float roughness1 = sc->data0;
 	float roughness2 = sc->data1;
@@ -170,7 +170,7 @@
 	float3 Tg = sc->T;
 #else
 	float offset = 0.0f;
-	float3 Tg = make_float3(1.0f,0.0f,0.0f);
+	float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
 #endif
 	float roughness1 = sc->data0;
 	float roughness2 = sc->data1;
@@ -225,7 +225,7 @@
 	float3 Tg = sc->T;
 #else
 	float offset = 0.0f;
-	float3 Tg = make_float3(1.0f,0.0f,0.0f);
+	float3 Tg = make_float3(1.0f, 0.0f, 0.0f);
 #endif
 	float roughness1 = sc->data0;
 	float roughness2 = sc->data1;