[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58039] trunk/blender/source/blender/ render/intern/source/convertblender.c: fix for crash deleting the world when viewport preview is used.

[Campbell Barton]

Revision: 58039
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58039
Author:   campbellbarton
Date:     2013-07-06 07:34:38 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
fix for crash deleting the world when viewport preview is used.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-06 07:21:08 UTC (rev 58038)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2013-07-06 07:34:38 UTC (rev 58039)
@@ -4903,13 +4903,13 @@
 	if (re->wrld.aosphere) {
 		MEM_freeN(re->wrld.aosphere);
 		re->wrld.aosphere= NULL;
-		if (re->scene)
+		if (re->scene && re->scene->world)
 			re->scene->world->aosphere= NULL;
 	}
 	if (re->wrld.aotables) {
 		MEM_freeN(re->wrld.aotables);
 		re->wrld.aotables= NULL;
-		if (re->scene)
+		if (re->scene && re->scene->world)
 			re->scene->world->aotables= NULL;
 	}
 	if (re->r.mode & R_RAYTRACE)