[Bf-blender-cvs] [61c972c] viewport_bvh_select: Fix crash on undo and file read

Julian Eisel noreply at git.blender.org
Thu Aug 25 17:45:23 CEST 2016


Commit: 61c972c3ef2c4c8a540f342bcfedf92f17dee5f3
Author: Julian Eisel
Date:   Thu Aug 25 17:45:01 2016 +0200
Branches: viewport_bvh_select
https://developer.blender.org/rB61c972c3ef2c4c8a540f342bcfedf92f17dee5f3

Fix crash on undo and file read

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesdna/DNA_view3d_types.h

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ded60af..0a660d8 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7031,6 +7031,7 @@ static bool direct_link_screen(FileData *fd, bScreen *sc)
 				BLI_listbase_clear(&v3d->afterdraw_xraytransp);
 				v3d->properties_storage = NULL;
 				v3d->defmaterial = NULL;
+				v3d->bvhtree = NULL;
 				
 				/* render can be quite heavy, set to solid on load */
 				if (v3d->drawtype == OB_RENDER)
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 6459c5d..6dc4ae7 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -238,7 +238,7 @@ typedef struct View3D {
 	float stereo3d_volume_alpha;
 	float stereo3d_convergence_alpha;
 
-	/** Viewport BVH tree. Used for BVH based selection. */
+	/** Viewport BVH tree (runtime only). Used for BVH based selection. */
 	struct BVHTree *bvhtree;
 
 	/* Previous viewport draw type.




More information about the Bf-blender-cvs mailing list