diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-03 07:04:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-03 07:04:44 +0400 |
| commit | 8f1e51a7d96a469718e5281aac66ac086da474a1 (patch) | |
| tree | 669e0be524d029c4a00b5ed9ab1a2b1e3933878c /source | |
| parent | bebaa410474fd79fc6f3b4ebeaea82cb170aa364 (diff) | |
remove WINDOWS checks in cmake, this variable isn't defined on windows and checks weren't needed.
also remove redundant dot_v3v3 in shrinkwrap constraint.
Diffstat (limited to 'source')
| -rw-r--r-- | source/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 529aaac4923..391fdf42d28 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -28,9 +28,5 @@ add_subdirectory(blender) if(WITH_GAMEENGINE) add_subdirectory(gameengine) endif() - -if(WINDOWS) - add_subdirectory(icons) -endif() add_subdirectory(tests) diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index a1cb360e0a4..7b7d20a54e0 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -3392,13 +3392,11 @@ static void shrinkwrap_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstra if (scon->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS) no[1] = 1.0f; if (scon->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) no[2] = 1.0f; - if (dot_v3v3(no, no) < FLT_EPSILON) { + if (normalize_v3(no) < FLT_EPSILON) { fail = TRUE; break; } - normalize_v3(no); - bvhtree_from_mesh_faces(&treeData, target, scon->dist, 4, 6); if (treeData.tree == NULL) { |