[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41025] trunk/blender/source/blender: make sure render layer names are unique when setting through rna.

[Campbell Barton]

Revision: 41025
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41025
Author:   campbellbarton
Date:     2011-10-15 09:59:31 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
make sure render layer names are unique when setting through rna.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2011-10-15 09:43:42 UTC (rev 41024)
+++ trunk/blender/source/blender/editors/interface/interface.c	2011-10-15 09:59:31 UTC (rev 41025)
@@ -1259,7 +1259,6 @@
 void ui_set_but_vectorf(uiBut *but, const float vec[3])
 {
 	PropertyRNA *prop;
-	int a, tot;
 
 	if(but->editvec) {
 		copy_v3_v3(but->editvec, vec);
@@ -1269,11 +1268,15 @@
 		prop= but->rnaprop;
 
 		if(RNA_property_type(prop) == PROP_FLOAT) {
+			int tot;
+			int a;
+
 			tot= RNA_property_array_length(&but->rnapoin, prop);
 			tot= MIN2(tot, 3);
 
-			for(a=0; a<tot; a++)
+			for (a=0; a<tot; a++) {
 				RNA_property_float_set_index(&but->rnapoin, prop, a, vec[a]);
+			}
 		}
 	}
 	else if(but->pointype == CHA) {

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2011-10-15 09:43:42 UTC (rev 41024)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2011-10-15 09:59:31 UTC (rev 41025)
@@ -812,8 +812,8 @@
 {
 	Scene *scene= (Scene*)ptr->id.data;
 	SceneRenderLayer *rl= (SceneRenderLayer*)ptr->data;
-
 	BLI_strncpy_utf8(rl->name, value, sizeof(rl->name));
+	BLI_uniquename(&scene->r.layers, rl, "RenderLayer", '.', offsetof(SceneRenderLayer, name), sizeof(rl->name));
 
 	if(scene->nodetree) {
 		bNode *node;