[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25306] trunk/blender/source/blender: Fix for [#20331] adding and removing render layers in specific sequence creates layers with the same name
Matt Ebb
matt at mke3.net
Fri Dec 11 06:23:01 CET 2009
Revision: 25306
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25306
Author: broken
Date: 2009-12-11 06:23:00 +0100 (Fri, 11 Dec 2009)
Log Message:
-----------
Fix for [#20331] adding and removing render layers in specific sequence creates layers with the same name
Render layers now use the same consistent 'unique name' function as other parts of Blender (i.e. RenderLayer.001). Updated the defaults for consistency.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/editors/datafiles/B.blend.c
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2009-12-11 04:03:55 UTC (rev 25305)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2009-12-11 05:23:00 UTC (rev 25306)
@@ -29,6 +29,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#include <stddef.h>
#include <stdio.h>
#include <string.h>
@@ -862,7 +863,8 @@
int tot= 1 + BLI_countlist(&sce->r.layers);
srl= MEM_callocN(sizeof(SceneRenderLayer), "new render layer");
- sprintf(srl->name, "%d RenderLayer", tot);
+ sprintf(srl->name, "RenderLayer");
+ BLI_uniquename(&sce->r.layers, srl, "RenderLayer", '.', offsetof(SceneRenderLayer, name), 32);
BLI_addtail(&sce->r.layers, srl);
/* note, this is also in render, pipeline.c, to make layer when scenedata doesnt have it */
Modified: trunk/blender/source/blender/editors/datafiles/B.blend.c
===================================================================
--- trunk/blender/source/blender/editors/datafiles/B.blend.c 2009-12-11 04:03:55 UTC (rev 25305)
+++ trunk/blender/source/blender/editors/datafiles/B.blend.c 2009-12-11 05:23:00 UTC (rev 25306)
@@ -1,613 +1,615 @@
/* DataToC output of file <B_blend> */
-int datatoc_B_blend_size= 320428;
+int datatoc_B_blend_size= 320520;
char datatoc_B_blend[]= {
- 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 53, 48,
- 82, 69, 78, 68, 32, 0, 0, 0,224,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,250, 0, 0, 0,
- 83, 99,101,110,101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 76, 79, 66, 24, 1, 0, 0,
-240,236,191, 95,255,127, 0, 0,197, 0, 0, 0, 1, 0, 0, 0, 32, 32, 32, 56, 8, 0, 0, 0,250, 0, 0, 0, 1, 0, 0, 1,
-208, 30,165, 29, 1, 0, 0, 0, 48,180, 4, 28, 1, 0, 0, 0, 0, 16, 0, 0,128, 32, 4, 0, 60,109,101,109,111,114,121, 50,
- 62, 0, 0, 0, 0, 0, 0, 0, 34,239, 28, 1, 1, 0, 0, 0, 40, 0, 0, 0, 48, 0, 0, 0, 32,238,191, 95,255,127, 0, 0,
- 80,237,191, 95,255,127, 0, 0,208,198,223, 28, 32, 0, 0, 0,224,237,191, 95,255,127, 0, 0, 48,147,201, 20, 1, 0, 0, 0,
- 45, 0, 0, 0, 0, 0, 0, 0,118, 0, 0, 0, 0, 0, 0, 0,192,237,191, 95,255,127, 0, 0,245, 3, 94, 0, 1, 0, 0, 0,
-160,237,191, 95,255,127, 0, 0,224,237,191, 95,255,127, 0, 0, 32, 0, 0, 0, 82, 69, 78, 68, 48,147,201, 20, 1, 0, 0, 0,
- 82, 69, 78, 68, 32, 0, 0, 0,224,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 16,238,191, 95,255,127, 0, 0,
- 16,238,191, 95,255,127, 0, 0,187, 10, 94, 0, 1, 0, 0, 0, 48,102, 4, 28, 1, 0, 0, 0, 48,147,201, 20, 1, 0, 0, 0,
- 1, 0, 0, 0,250, 0, 0, 0, 83, 99,101,110,101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-208, 30,165, 29, 1, 0, 0, 0, 87, 77, 0, 0, 8, 1, 0, 0,144, 6,163, 29, 1, 0, 0, 0, 98, 1, 0, 0, 1, 0, 0, 0,
+ 66, 76, 69, 78, 68, 69, 82, 45,
+118, 50, 53, 48, 82, 69, 78, 68, 32, 0, 0, 0,224,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,
+250, 0, 0, 0, 83, 99,101,110,101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 76, 79, 66,
+ 24, 1, 0, 0,240,236,191, 95,255,127, 0, 0,197, 0, 0, 0, 1, 0, 0, 0, 32, 32, 32, 56, 8, 0, 0, 0,250, 0, 0, 0,
+ 1, 0, 0, 1, 32,158,131, 29, 1, 0, 0, 0, 48, 66,136, 27, 1, 0, 0, 0, 0, 16, 0, 0,128, 32, 4, 0, 60,109,101,109,
+111,114,121, 50, 62, 0, 0, 0, 0, 0, 0, 0,178, 38, 29, 1, 1, 0, 0, 0, 40, 0, 0, 0, 48, 0, 0, 0, 32,238,191, 95,
+255,127, 0, 0, 80,237,191, 95,255,127, 0, 0,208,230, 29, 29, 32, 0, 0, 0,224,237,191, 95,255,127, 0, 0,208, 78,111, 27,
+ 1, 0, 0, 0, 45, 0, 0, 0, 0, 0, 0, 0,118, 0, 0, 0, 0, 0, 0, 0,192,237,191, 95,255,127, 0, 0, 13,241, 93, 0,
+ 1, 0, 0, 0,160,237,191, 95,255,127, 0, 0,224,237,191, 95,255,127, 0, 0, 32, 0, 0, 0, 82, 69, 78, 68,208, 78,111, 27,
+ 1, 0, 0, 0, 82, 69, 78, 68, 32, 0, 0, 0,224,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 16,238,191, 95,
+255,127, 0, 0, 16,238,191, 95,255,127, 0, 0,211,247, 93, 0, 1, 0, 0, 0, 48, 88,131, 27, 1, 0, 0, 0,208, 78,111, 27,
+ 1, 0, 0, 0, 1, 0, 0, 0,250, 0, 0, 0, 83, 99,101,110,101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 32,158,131, 29, 1, 0, 0, 0, 87, 77, 0, 0, 8, 1, 0, 0,208, 87,128, 29, 1, 0, 0, 0, 98, 1, 0, 0,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 87, 77, 87,105,110, 77, 97,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 89,128, 29, 1, 0, 0, 0, 16, 89,128, 29, 1, 0, 0, 0, 16, 89,128, 29,
+ 1, 0, 0, 0, 16, 89,128, 29, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 87, 77, 87,105,110, 77, 97,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,208, 7,163, 29, 1, 0, 0, 0,208, 7,163, 29, 1, 0, 0, 0,208, 7,163, 29, 1, 0, 0, 0,
-208, 7,163, 29, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 16,158,162, 21, 1, 0, 0, 0, 64, 69,200, 20, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,116,160, 21, 1, 0, 0, 0, 32, 73,200, 20, 1, 0, 0, 0,
- 2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48,220,195, 20, 1, 0, 0, 0, 48,220,195, 20, 1, 0, 0, 0,
- 48,220,195, 20, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80,125,140, 27, 1, 0, 0, 0, 80,125,140, 27, 1, 0, 0, 0,
- 80,125,140, 27, 1, 0, 0, 0, 68, 65, 84, 65,224, 0, 0, 0,208, 7,163, 29, 1, 0, 0, 0, 99, 1, 0, 0, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64,235,195, 20, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
-208, 30,165, 29, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,115, 99,114,101,101,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 7,128, 4, 0, 0, 0, 0, 1, 0,238, 3,
- 0, 0, 1, 0,255,255, 0, 0, 96,160,160, 21, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,192,165,164, 21, 1, 0, 0, 0,240,165,201, 20, 1, 0, 0, 0,240,165,201, 20, 1, 0, 0, 0,
-240,125,140, 27, 1, 0, 0, 0,176,126,140, 27, 1, 0, 0, 0,112,127,140, 27, 1, 0, 0, 0,112,127,140, 27, 1, 0, 0, 0,
- 96,103,164, 21, 1, 0, 0, 0, 80,237,200, 20, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 83, 78, 0, 0,208, 0, 0, 0,112,122,163, 29, 1, 0, 0, 0,191, 0, 0, 0, 1, 0, 0, 0,208,190,163, 29, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 82, 65,110,105,109, 97,116,
-105,111,110, 0, 46, 48, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-224,182,162, 29, 1, 0, 0, 0, 16,176, 20, 27, 1, 0, 0, 0, 80,148, 21, 27, 1, 0, 0, 0, 32,132,163, 29, 1, 0, 0, 0,
-128,132,163, 29, 1, 0, 0, 0,144, 0,164, 29, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 48,180, 4, 28, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,232, 48, 21, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,224,182,162, 29, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0,
-240, 77,162, 29, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 68, 65, 84, 65, 32, 0, 0, 0,240, 77,162, 29, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0,112, 2,160, 29, 1, 0, 0, 0,
-224,182,162, 29, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,
-112, 2,160, 29, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0,160, 41,161, 29, 1, 0, 0, 0,240, 77,162, 29, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,128, 7,128, 4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,160, 41,161, 29, 1, 0, 0, 0,
-192, 0, 0, 0, 1, 0, 0, 0,208,140,162, 21, 1, 0, 0, 0,112, 2,160, 29, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-128, 7, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,208,140,162, 21, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0,
-144,246,142, 27, 1, 0, 0, 0,160, 41,161, 29, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,100, 4, 0, 0, 0, 0,
- 68, 65, 84, 65, 32, 0, 0, 0,144,246,142, 27, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0, 64,141,160, 21, 1, 0, 0, 0,
-208,140,162, 21, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,128, 7,100, 4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,
- 64,141,160, 21, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0, 32, 31,142, 27, 1, 0, 0, 0,144,246,142, 27, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 48, 6, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, 32, 31,142, 27, 1, 0, 0, 0,
-192, 0, 0, 0, 1, 0, 0, 0,160,237,142, 27, 1, 0, 0, 0, 64,141,160, 21, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 48, 6,100, 4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,160,237,142, 27, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0,
- 0, 62,142, 27, 1, 0, 0, 0, 32, 31,142, 27, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 6,228, 1, 0, 0, 0, 0,
- 68, 65, 84, 65, 32, 0, 0, 0, 0, 62,142, 27, 1, 0, 0, 0,192, 0, 0, 0, 1, 0, 0, 0,240,185,140, 27, 1, 0, 0, 0,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list