[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36148] trunk/blender/source/blender/ blenloader/intern/readfile.c: fix [#26904] Crush while open file !

[Campbell Barton]

Revision: 36148
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36148
Author:   campbellbarton
Date:     2011-04-13 14:40:50 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
fix [#26904] Crush while open file !
commit r28002 was attempting to run do-versions on an invalid pointer.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=28002

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	2011-04-13 09:15:45 UTC (rev 36147)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-04-13 14:40:50 UTC (rev 36148)
@@ -5354,10 +5354,12 @@
 				
 				/* WARNING: gpencil data is no longer stored directly in sima after 2.5 
 				 * so sacrifice a few old files for now to avoid crashes with new files!
-				 */
-				//sima->gpd= newdataadr(fd, sima->gpd);
-				//if (sima->gpd)
-				//	direct_link_gpencil(fd, sima->gpd);
+				 * committed: r28002 */
+#if 0
+				sima->gpd= newdataadr(fd, sima->gpd);
+				if (sima->gpd)
+					direct_link_gpencil(fd, sima->gpd);
+#endif
 			}
 			else if(sl->spacetype==SPACE_NODE) {
 				SpaceNode *snode= (SpaceNode *)sl;
@@ -6649,10 +6651,14 @@
 			}
 			else if (sl->spacetype==SPACE_IMAGE) {
 				SpaceImage *sima= (SpaceImage *)sl;
+#if 0			/* see comment on r28002 */
 				if(sima->gpd) {
 					versions_gpencil_add_main(&main->gpencil, (ID *)sima->gpd, "GPencil Image");
 					sima->gpd= NULL;
 				}
+#else
+				sima->gpd= NULL;
+#endif
 			}
 		}
 	}