[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26427] trunk/blender/source/blender/ editors/space_view3d/space_view3d.c: Possible fix for #20835: background images were not duplicated correctly

Brecht Van Lommel brecht at blender.org
Sat Jan 30 11:16:11 CET 2010


Revision: 26427
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26427
Author:   blendix
Date:     2010-01-30 11:16:11 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
Possible fix for #20835: background images were not duplicated correctly
when splitting 3d view, causing them to be lost on file reload.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/space_view3d.c

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-01-30 09:59:01 UTC (rev 26426)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-01-30 10:16:11 UTC (rev 26427)
@@ -290,6 +290,7 @@
 {
 	View3D *v3do= (View3D *)sl;
 	View3D *v3dn= MEM_dupallocN(sl);
+	BGpic *bgpic;
 	
 	/* clear or remove stuff from old */
 	
@@ -304,13 +305,11 @@
 	
 	/* copy or clear inside new stuff */
 
-	if(v3dn->bgpicbase.first) {
-		BGpic *bgpic;
-			for ( bgpic= v3dn->bgpicbase.first; bgpic; bgpic= bgpic->next ) {
-			bgpic= MEM_dupallocN(bgpic);
-			if(bgpic->ima) bgpic->ima->id.us++;
-			}
-	}
+	BLI_duplicatelist(&v3dn->bgpicbase, &v3do->bgpicbase);
+	for(bgpic= v3dn->bgpicbase.first; bgpic; bgpic= bgpic->next)
+		if(bgpic->ima)
+			bgpic->ima->id.us++;
+
 	v3dn->properties_storage= NULL;
 	
 	return (SpaceLink *)v3dn;





More information about the Bf-blender-cvs mailing list