[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26318] trunk/blender/source/blender/ blenloader/intern/readfile.c: bugfix [#20823] Attempting to undo renaming a UV set on this scene causes a crash

[Campbell Barton]

Revision: 26318
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26318
Author:   campbellbarton
Date:     2010-01-27 01:01:59 +0100 (Wed, 27 Jan 2010)

Log Message:
-----------
bugfix [#20823] Attempting to undo renaming a UV set on this scene causes a 
crash

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   2010-01-26 
23:32:03 UTC (rev 26317)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2010-01-27 
00:01:59 UTC (rev 26318)
@@ -4886,8 +4886,10 @@
                                        sipo->editipo= NULL;
 
 #endif
-                                       if (ads->filter_grp) {
-                                               ads->filter_grp= 
restore_pointer_by_name(newmain, (ID *)ads->filter_grp, 0);
+                                       if(ads) {
+                                               if(ads->filter_grp) {
+                                                       ads->filter_grp= 
restore_pointer_by_name(newmain, (ID *)ads->filter_grp, 0);
+                                               }
                                        }
                                }
                                else if(sl->spacetype==SPACE_BUTS) {


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