[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56868] trunk/blender/source/blender/ makesrna/intern/rna_scene.c: Fix #35398: changing render layer name causes animation to be lost.

Brecht Van Lommel brechtvanlommel at pandora.be
Fri May 17 02:39:38 CEST 2013


Revision: 56868
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56868
Author:   blendix
Date:     2013-05-17 00:39:37 +0000 (Fri, 17 May 2013)
Log Message:
-----------
Fix #35398: changing render layer name causes animation to be lost.

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-05-16 23:49:05 UTC (rev 56867)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-05-17 00:39:37 UTC (rev 56868)
@@ -1129,6 +1129,10 @@
 {
 	Scene *scene = (Scene *)ptr->id.data;
 	SceneRenderLayer *rl = (SceneRenderLayer *)ptr->data;
+	char oldname[sizeof(rl->name)];
+
+	BLI_strncpy(oldname, rl->name, sizeof(rl->name));
+
 	BLI_strncpy_utf8(rl->name, value, sizeof(rl->name));
 	BLI_uniquename(&scene->r.layers, rl, DATA_("RenderLayer"), '.', offsetof(SceneRenderLayer, name), sizeof(rl->name));
 
@@ -1143,6 +1147,9 @@
 			}
 		}
 	}
+
+	/* fix all the animation data which may link to this */
+	BKE_all_animdata_fix_paths_rename(NULL, "render.layers", oldname, rl->name);
 }
 
 static char *rna_SceneRenderLayer_path(PointerRNA *ptr)




More information about the Bf-blender-cvs mailing list