[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44767] trunk/blender/source/blender/ editors/space_view3d: DO not increment image user counter on view3d duplicate and not decrement

[Sergey Sharybin]

Revision: 44767
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44767
Author:   nazgul
Date:     2012-03-09 13:43:37 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
DO not increment image user counter on view3d duplicate and not decrement
it's user count on free. That's how other spaces handles ID block (like
image editor, space clip).

This fixes issue when loading file without loading UI when current layout
has got background images set.
Also this hopefully will fix issue #30429: Background Images Lost on 
Save/Close/Reload

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

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c    
2012-03-09 13:37:42 UTC (rev 44766)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c    
2012-03-09 13:43:37 UTC (rev 44767)
@@ -333,10 +333,6 @@
 {
        View3D *vd= (View3D *) sl;
 
-       BGpic *bgpic;
-       for (bgpic= vd->bgpicbase.first; bgpic; bgpic= bgpic->next) {
-               if (bgpic->ima) bgpic->ima->id.us--;
-       }
        BLI_freelistN(&vd->bgpicbase);
 
        if (vd->localvd) MEM_freeN(vd->localvd);
@@ -355,7 +351,6 @@
 {
        View3D *v3do= (View3D *)sl;
        View3D *v3dn= MEM_dupallocN(sl);
-       BGpic *bgpic;
        
        /* clear or remove stuff from old */
        
@@ -374,9 +369,6 @@
        /* copy or clear inside new stuff */
 
        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;
        

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2012-03-09 13:37:42 UTC (rev 44766)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2012-03-09 13:43:37 UTC (rev 44767)
@@ -3648,12 +3648,6 @@
 {
        BLI_remlink(&v3d->bgpicbase, bgpic);
 
-       if (bgpic->ima)
-               id_us_min(&bgpic->ima->id);
-
-       if (bgpic->clip)
-               id_us_min(&bgpic->clip->id);
-
        MEM_freeN(bgpic);
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs