diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-22 03:07:09 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-10-22 03:07:09 +0400 |
| commit | 71206c9337ec88d8711fa66c128fe464cf27e451 (patch) | |
| tree | 570102e52ff79db06f050a208c3aec667f9290dc /source/blender/blenkernel | |
| parent | 7a4e9d97fff0a795a3ab076702d8b856b2e5bf62 (diff) | |
Patch from Timothy Baldridge
* add irix6 to GHOST windowing system (same as linux2 et al)
* fix faulty return lines in shrinkwrap.c
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/shrinkwrap.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 76af9a763ee..28bf7aee884 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -215,7 +215,11 @@ void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc) BENCH(bvhtree_from_mesh_verts(&treeData, calc->target, 0.0, 2, 6)); - if(treeData.tree == NULL) return OUT_OF_MEMORY(); + if(treeData.tree == NULL) + { + OUT_OF_MEMORY(); + return; + } //Setup nearest nearest.index = -1; @@ -526,7 +530,11 @@ void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) //Create a bvh-tree of the given target BENCH(bvhtree_from_mesh_faces( &treeData, calc->target, 0.0, 2, 6)); - if(treeData.tree == NULL) return OUT_OF_MEMORY(); + if(treeData.tree == NULL) + { + OUT_OF_MEMORY(); + return; + } //Setup nearest nearest.index = -1; |