forked from bartvdbraak/blender
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.
This commit is contained in:
parent
bebaa41047
commit
8f1e51a7d9
@ -106,10 +106,6 @@ add_definitions(
|
|||||||
-DNEWDIRVELMOTEST=0
|
-DNEWDIRVELMOTEST=0
|
||||||
)
|
)
|
||||||
|
|
||||||
if(WINDOWS)
|
|
||||||
add_definitions(-DUSE_MSVC6FIXES)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WITH_OPENMP)
|
if(WITH_OPENMP)
|
||||||
add_definitions(-DPARALLEL=1)
|
add_definitions(-DPARALLEL=1)
|
||||||
else()
|
else()
|
||||||
|
@ -29,8 +29,4 @@ if(WITH_GAMEENGINE)
|
|||||||
add_subdirectory(gameengine)
|
add_subdirectory(gameengine)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(WINDOWS)
|
|
||||||
add_subdirectory(icons)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_subdirectory(tests)
|
add_subdirectory(tests)
|
||||||
|
@ -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_Y_AXIS) no[1] = 1.0f;
|
||||||
if (scon->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) no[2] = 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;
|
fail = TRUE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
normalize_v3(no);
|
|
||||||
|
|
||||||
|
|
||||||
bvhtree_from_mesh_faces(&treeData, target, scon->dist, 4, 6);
|
bvhtree_from_mesh_faces(&treeData, target, scon->dist, 4, 6);
|
||||||
if (treeData.tree == NULL) {
|
if (treeData.tree == NULL) {
|
||||||
|
Loading…
Reference in New Issue
Block a user