diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 08:17:43 +0400 |
| commit | 121ff4223dbd5c42ecc4919d09ce464d01faf4e7 (patch) | |
| tree | 5102e8d4f18a142aaff07fc355d0fd0208ccf651 /source/blender/blenloader | |
| parent | a96c3ce9e0a61bc29fef8212a742658795aabbed (diff) | |
| parent | 77c51607914b7fe4744437f6d47fedab628b444d (diff) | |
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index a4e71293177..277c3d927a3 100644 --- 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; |