[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41676] trunk/blender/source/blender/ blenloader/intern/readfile.c: Cycles: fix crash loading existing files, forgot to merge over this line.

[Brecht Van Lommel]

Revision: 41676
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41676
Author:   blendix
Date:     2011-11-08 18:49:12 +0000 (Tue, 08 Nov 2011)
Log Message:
-----------
Cycles: fix crash loading existing files, forgot to merge over this line.

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-11-08 
18:23:23 UTC (rev 41675)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2011-11-08 
18:49:12 UTC (rev 41676)
@@ -5611,6 +5611,7 @@
                        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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs