[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29006] branches/render25: Render Branch: fix missing hardness property for Cook-Torrance in UI.

[Brecht Van Lommel]

Revision: 29006
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29006
Author:   blendix
Date:     2010-05-26 18:06:35 +0200 (Wed, 26 May 2010)

Log Message:
-----------
Render Branch: fix missing hardness property for Cook-Torrance in UI.

Modified Paths:
--------------
    branches/render25/release/scripts/ui/properties_material.py
    branches/render25/source/blender/makesrna/intern/rna_material.c

Modified: branches/render25/release/scripts/ui/properties_material.py
===================================================================
--- branches/render25/release/scripts/ui/properties_material.py	2010-05-26 16:04:11 UTC (rev 29005)
+++ branches/render25/release/scripts/ui/properties_material.py	2010-05-26 16:06:35 UTC (rev 29006)
@@ -452,7 +452,7 @@
         col.prop(mat, "use_specular_ramp", text="Ramp")
 
         col = layout.column()
-        if mat.specular_shader in ('COOKTORR', 'PHONG'):
+        if mat.specular_shader in ('COOK_TORRANCE', 'PHONG'):
             col.prop(mat, "specular_hardness", text="Hardness")
         elif mat.specular_shader == 'BLINN':
             split = layout.split()

Modified: branches/render25/source/blender/makesrna/intern/rna_material.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_material.c	2010-05-26 16:04:11 UTC (rev 29005)
+++ branches/render25/source/blender/makesrna/intern/rna_material.c	2010-05-26 16:06:35 UTC (rev 29006)
@@ -1316,7 +1316,7 @@
 	PropertyRNA *prop;
 	
 	static EnumPropertyItem prop_specular_shader_items[] = {
-		{MA_SPEC_COOKTORR, "COOK_TORR", 0, "Cook Torrance", ""},
+		{MA_SPEC_COOKTORR, "COOK_TORRANCE", 0, "Cook Torrance", ""},
 		{MA_SPEC_PHONG, "PHONG", 0, "Phong", ""},
 		{MA_SPEC_BLINN, "BLINN", 0, "Blinn", ""},
 		{MA_SPEC_TOON, "TOON", 0, "Toon", ""},