[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37166] branches/soc-2011-onion: Revision: 29572

[Jason Wilkins]

Revision: 37166
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37166
Author:   jwilkins
Date:     2011-06-04 06:07:45 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
Revision: 29572
Author: nicholasbishop
Date: 6:37:12 PM, Saturday, June 19, 2010
Message:
* Change default mask layer name to "Mask".

Modified Paths:
--------------
    branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c

Property Changed:
----------------
    branches/soc-2011-onion/


Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29483,29503,29514,29536
/trunk/blender:36833-37054
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29483,29503,29514,29536,29572
/trunk/blender:36833-37054

Modified: branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-06-04 06:03:15 UTC (rev 37165)
+++ branches/soc-2011-onion/source/blender/blenkernel/intern/customdata.c	2011-06-04 06:07:45 UTC (rev 37166)
@@ -806,6 +806,8 @@
 		mcol[i] = default_mcol;
 }
 
+/* Grid */
+
 void layerCopy_grid(const void *source_v, void *dest_v, int count)
 {
 	const CustomData *source = source_v;
@@ -872,7 +874,7 @@
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
 	{sizeof(CustomData), "CustomData", 1, "Face Grid", layerCopy_grid, layerFree_grid, NULL, NULL, NULL},
 	{sizeof(float)*3, "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
-	{sizeof(float), "", 0, NULL, NULL, NULL, NULL, NULL, NULL},
+	{sizeof(float), "", 0, "Mask", NULL, NULL, NULL, NULL, NULL},
 };
 
 static const char *LAYERTYPENAMES[CD_NUMTYPES] = {