archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T48415: Segfault on opening .blend in which a 'surface' force object was saved in Edit mode.

Browse Source 
In that case, surface modifier won't run (until surface object goes back to Object mode),
and its bvhtree remains NULL.
This commit is contained in:
Bastien Montagne
2016-06-01 15:26:58 +02:00
parent 8cf8679b53
commit b1704d18a1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/effect.c
View File

@@ -566,7 +566,9 @@ int get_effector_data(EffectorCache *eff, EffectorData *efd, EffectedPoint *poin
float cfra = eff->scene->r.cfra;
int ret = 0;
if (eff->pd && eff->pd->shape==PFIELD_SHAPE_SURFACE && eff->surmd) {
/* In case surface object is in Edit mode when loading the .blend, surface modifier is never executed
* and bvhtree never built, see T48415. */
if (eff->pd && eff->pd->shape==PFIELD_SHAPE_SURFACE && eff->surmd && eff->surmd->bvhtree) {
/* closest point in the object surface is an effector */
float vec[3];