remove WINDOWS checks in cmake, this variable isn't defined on windows and checks...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Sep 2013 03:04:44 +0000 (03:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Sep 2013 03:04:44 +0000 (03:04 +0000)
also remove redundant dot_v3v3 in shrinkwrap constraint.

intern/elbeem/CMakeLists.txt
source/CMakeLists.txt
source/blender/blenkernel/intern/constraint.c

index e9d29561121618d2d6a9b94d92534952502716a7..2adeb573f06a3e1c697ce8661715ce3294e44a67 100644 (file)
@@ -106,10 +106,6 @@ add_definitions(
        -DNEWDIRVELMOTEST=0
 )
 
-if(WINDOWS)
-       add_definitions(-DUSE_MSVC6FIXES)
-endif()
-
 if(WITH_OPENMP)
        add_definitions(-DPARALLEL=1)
 else()
index 529aaac492365dd99622d654d057cd37a6152475..391fdf42d28a68e42a593f7f130149c6c66f6502 100644 (file)
@@ -28,9 +28,5 @@ add_subdirectory(blender)
 if(WITH_GAMEENGINE)
        add_subdirectory(gameengine)
 endif()
-       
-if(WINDOWS)
-       add_subdirectory(icons)
-endif()
 
 add_subdirectory(tests)
index a1cb360e0a45b3862d39678bb3a3f367d7f796f6..7b7d20a54e01ac0ccbb73b10476483aea52c4033 100644 (file)
@@ -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) {