[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53001] trunk/blender: Blender Internal / Texture UI:

[Thomas Dinges]

Revision: 53001
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53001
Author:   dingto
Date:     2012-12-14 14:59:16 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Blender Internal / Texture UI:
* Ocean Texture was not in alphabetical order. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/properties.py
    trunk/blender/source/blender/makesrna/intern/rna_texture.c

Modified: trunk/blender/intern/cycles/blender/addon/properties.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/properties.py	2012-12-14 12:06:24 UTC (rev 53000)
+++ trunk/blender/intern/cycles/blender/addon/properties.py	2012-12-14 14:59:16 UTC (rev 53001)
@@ -37,8 +37,8 @@
     )
 
 enum_shading_systems = (
-    ('GPU_COMPATIBLE', "GPU Compatible", "Restricted shading system compatible with GPU rendering"),
-    ('OSL', "Open Shading Language", "Open Shading Language shading system that only runs on the CPU"),
+    ('SVM', "SVM", "Restricted shading system compatible with GPU rendering"),
+    ('OSL', "OSL", "Open Shading Language shading system that only runs on the CPU"),
     )
 
 enum_displacement_methods = (
@@ -93,7 +93,7 @@
                 name="Shading System",
                 description="Shading system to use for rendering",
                 items=enum_shading_systems,
-                default='GPU_COMPATIBLE',
+                default='SVM',
                 )
 
         cls.progressive = BoolProperty(

Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c	2012-12-14 12:06:24 UTC (rev 53000)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c	2012-12-14 14:59:16 UTC (rev 53001)
@@ -71,12 +71,12 @@
 	{TEX_MUSGRAVE, "MUSGRAVE", ICON_TEXTURE, "Musgrave", "Procedural - highly flexible fractal noise texture"},
 	{TEX_NOISE, "NOISE", ICON_TEXTURE, "Noise",
 	            "Procedural - random noise, gives a different result every time, for every frame, for every pixel"},
+	{TEX_OCEAN, "OCEAN", ICON_TEXTURE, "Ocean", "Use a texture generated by an Ocean modifier"},
 	{TEX_POINTDENSITY, "POINT_DENSITY", ICON_TEXTURE, "Point Density", ""},
 	{TEX_STUCCI, "STUCCI", ICON_TEXTURE, "Stucci", "Procedural - create a fractal noise texture"},
 	{TEX_VORONOI, "VORONOI", ICON_TEXTURE, "Voronoi", "Procedural - create cell-like patterns based on Worley noise"},
 	{TEX_VOXELDATA, "VOXEL_DATA", ICON_TEXTURE, "Voxel Data", "Create a 3D texture based on volumetric data"},
 	{TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", "Procedural - wave generated bands or rings, with optional noise"},
-	{TEX_OCEAN, "OCEAN", ICON_TEXTURE, "Ocean", "Use a texture generated by an Ocean modifier"},
 	{0, NULL, 0, NULL, NULL}
 };