projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs...
[blender-staging.git]
/
source
/
blender
/
blenloader
/
intern
/
readfile.c
diff --git
a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index a4e71293177ae88cacc77038fd55a0ba32e2c2e5..277c3d927a351302b7321b526650ac188ec360a3 100644
(file)
--- a/
source/blender/blenloader/intern/readfile.c
+++ b/
source/blender/blenloader/intern/readfile.c
@@
-5677,6
+5677,7
@@
static void direct_link_screen(FileData *fd, bScreen *sc)
else if(sl->spacetype==SPACE_BUTS) {
SpaceButs *sbuts= (SpaceButs *)sl;
sbuts->path= NULL;
+ sbuts->texuser= NULL;
}
else if(sl->spacetype==SPACE_CONSOLE) {
SpaceConsole *sconsole= (SpaceConsole *)sl;