[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36609] branches/bmesh/blender/source/ blender/blenkernel/intern/customdata.c: reverting change made r20939 with custom data layer merging.

[Campbell Barton]

Revision: 36609
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36609
Author:   campbellbarton
Date:     2011-05-11 08:43:39 +0000 (Wed, 11 May 2011)
Log Message:
-----------
reverting change made r20939 with custom data layer merging.
if this is really a fix it should be made in trunk first, but looks like it was committed by accident.

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

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-05-11 02:14:43 UTC (rev 36608)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c	2011-05-11 08:43:39 UTC (rev 36609)
@@ -1058,7 +1058,7 @@
 
 		if(lastflag & CD_FLAG_NOCOPY) continue;
 		else if(!((int)mask & (int)(1 << (int)type))) continue;
-		else if(number+1 < CustomData_number_of_layers(dest, type)) continue;
+		else if(number < CustomData_number_of_layers(dest, type)) continue;
 
 		if((alloctype == CD_ASSIGN) && (lastflag & CD_FLAG_NOFREE))
 			newlayer = customData_add_layer__internal(dest, type, CD_REFERENCE,