Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2009-05-04 14:24:53 +0400
committerJoshua Leung <aligorith@gmail.com>2009-05-04 14:24:53 +0400
commite4e70bfb913a0d50abfc5b6320290c90543372af (patch)
tree2251dc1af59cb83a502cc6d9a39b3e249d512b25 /source/blender/blenloader
parent22c2827d2de6cccf272cadeaa7632fc27f229a32 (diff)
2.5 - Bugfixes
* Loading files saved with 2.5 works again now without crashing. Was crashing when trying to load Grease Pencil data (even though there was none) * Fixed some msvc compiler warnings in own code
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 450161854ec..fd9da2059e1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4090,6 +4090,10 @@ static void direct_link_gpencil(FileData *fd, bGPdata *gpd)
bGPDframe *gpf;
bGPDstroke *gps;
+ /* we must firstly have some grease-pencil data to link! */
+ if (gpd == NULL)
+ return;
+
/* relink layers */
link_list(fd, &gpd->layers);