[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47718] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fix for previous commit, and noted some other spots that need doublechecking

[Joshua Leung]

Revision: 47718
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47718
Author:   aligorith
Date:     2012-06-11 03:06:31 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Fix for previous commit, and noted some other spots that need doublechecking

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2012-06-11 
03:03:36 UTC (rev 47717)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2012-06-11 
03:06:31 UTC (rev 47718)
@@ -5369,7 +5369,6 @@
                                                
                                                sclip->clip = newlibadr_us(fd, 
sc->id.lib, sclip->clip);
                                                sclip->mask = newlibadr_us(fd, 
sc->id.lib, sclip->mask);
-                                               sclip->gpd = newlibadr_us(fd, 
sc->id.lib, sclip->gpd);
                                                
                                                sclip->scopes.track_search = 
NULL;
                                                sclip->scopes.track_preview = 
NULL;
@@ -5377,9 +5376,9 @@
                                                sclip->scopes.ok = 0;
                                        }
                                        else if (sl->spacetype == SPACE_LOGIC) {
-                                               SpaceLogic *slog = (SpaceLogic 
*)sl;
+                                               SpaceLogic *slogic = 
(SpaceLogic *)sl;
                                                
-                                               slog->gpd = newlibadr_us(fd, 
sc->id.lib, slog->gpd);
+                                               slogic->gpd = newlibadr_us(fd, 
sc->id.lib, slogic->gpd);
                                        }
                                }
                        }
@@ -5650,13 +5649,11 @@
                                        sclip->mask = 
restore_pointer_by_name(newmain, (ID *)sclip->mask, 1);
                                        
                                        sclip->scopes.ok = 0;
-                                       
-                                       sclip->gpd = 
restore_pointer_by_name(newmain, (ID *)sclip->gpd, 1);
                                }
                                else if (sl->spacetype == SPACE_LOGIC) {
-                                       SpaceLogic *slog = (SpaceLogic *)sl;
+                                       SpaceLogic *slogic = (SpaceLogic *)sl;
                                        
-                                       slog->gpd = 
restore_pointer_by_name(newmain, (ID *)slog->gpd, 1);
+                                       slogic->gpd = 
restore_pointer_by_name(newmain, (ID *)slogic->gpd, 1);
                                }
                        }
                }
@@ -5898,7 +5895,8 @@
                        }
                        else if (sl->spacetype == SPACE_LOGIC) {
                                SpaceLogic *slogic = (SpaceLogic *)sl;
-                                       
+                               
+                               /* XXX: this is new stuff, which shouldn't be 
directly linking to gpd... */
                                if (slogic->gpd) {
                                        slogic->gpd = newdataadr(fd, 
slogic->gpd);
                                        direct_link_gpencil(fd, slogic->gpd);

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