[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59758] trunk/blender: remove WINDOWS checks in cmake, this variable isn' t defined on windows and checks weren't needed.

[Campbell Barton]

Revision: 59758
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59758
Author:   campbellbarton
Date:     2013-09-03 03:04:44 +0000 (Tue, 03 Sep 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/elbeem/CMakeLists.txt
    trunk/blender/source/CMakeLists.txt
    trunk/blender/source/blender/blenkernel/intern/constraint.c

Modified: trunk/blender/intern/elbeem/CMakeLists.txt
===================================================================
--- trunk/blender/intern/elbeem/CMakeLists.txt	2013-09-03 00:28:23 UTC (rev 59757)
+++ trunk/blender/intern/elbeem/CMakeLists.txt	2013-09-03 03:04:44 UTC (rev 59758)
@@ -106,10 +106,6 @@
 	-DNEWDIRVELMOTEST=0
 )
 
-if(WINDOWS)
-	add_definitions(-DUSE_MSVC6FIXES)
-endif()
-
 if(WITH_OPENMP)
 	add_definitions(-DPARALLEL=1)
 else()

Modified: trunk/blender/source/CMakeLists.txt
===================================================================
--- trunk/blender/source/CMakeLists.txt	2013-09-03 00:28:23 UTC (rev 59757)
+++ trunk/blender/source/CMakeLists.txt	2013-09-03 03:04:44 UTC (rev 59758)
@@ -28,9 +28,5 @@
 if(WITH_GAMEENGINE)
 	add_subdirectory(gameengine)
 endif()
-	
-if(WINDOWS)
-	add_subdirectory(icons)
-endif()
 
 add_subdirectory(tests)

Modified: trunk/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/constraint.c	2013-09-03 00:28:23 UTC (rev 59757)
+++ trunk/blender/source/blender/blenkernel/intern/constraint.c	2013-09-03 03:04:44 UTC (rev 59758)
@@ -3392,14 +3392,12 @@
 					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) {
 						fail = TRUE;