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:
authorTon Roosendaal <ton@blender.org>2006-12-12 14:13:43 +0300
committerTon Roosendaal <ton@blender.org>2006-12-12 14:13:43 +0300
commit4595bef2b401ec3d3da08641b75bef6ffa182fdc (patch)
tree92ea02158b314227f1b499625b23ee803e3cd8a4 /source/blender/blenloader
parent09e4fa8f6a2e46631a74ab74cecc319349b67313 (diff)
Three-fixes-in-one:
#5417: Only Shadow material gave shadow outside of Spot bundle #5414: Material Nodes: sockets without input were always treated as single value inputs, ignoring color or vector. (Caused by commit to do automatic conversions of socket links). #5420: When reading with old Blender a new file that has a new window type, saving it over, and read back in current Blender, the window type should be reset to EMPTY, because all its data got lost.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 0f087064a6a..3bd3999b3ae 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -3678,12 +3678,16 @@ static void direct_link_screen(FileData *fd, bScreen *sc)
link_list(fd, &(sa->spacedata));
link_list(fd, &(sa->panels));
+ /* accident can happen when read/save new file with older version */
+ if(sa->spacedata.first==NULL)
+ sa->spacetype= SPACE_EMPTY;
+
for(pa= sa->panels.first; pa; pa=pa->next) {
pa->paneltab= newdataadr(fd, pa->paneltab);
pa->active= 0;
pa->sortcounter= 0;
}
-
+
for (sl= sa->spacedata.first; sl; sl= sl->next) {
if (sl->spacetype==SPACE_VIEW3D) {
View3D *v3d= (View3D*) sl;