[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40392] trunk/blender: committed change to transforms THRESHOLD by accident, also update convenience makefile to regenerate real makefiles before static checking .

[Campbell Barton]

Revision: 40392
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40392
Author:   campbellbarton
Date:     2011-09-20 10:15:57 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
committed change to transforms THRESHOLD by accident, also update convenience makefile to regenerate real makefiles before static checking.

Modified Paths:
--------------
    trunk/blender/GNUmakefile
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/GNUmakefile
===================================================================
--- trunk/blender/GNUmakefile	2011-09-20 09:32:14 UTC (rev 40391)
+++ trunk/blender/GNUmakefile	2011-09-20 10:15:57 UTC (rev 40392)
@@ -36,7 +36,7 @@
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
 BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=""
+BUILD_CMAKE_ARGS:=
 
 
 # -----------------------------------------------------------------------------
@@ -77,14 +77,24 @@
 	NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
 endif
 
+
 # -----------------------------------------------------------------------------
+# Macro for configuring cmake
+
+CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
+                     -H$(BLENDER_DIR) \
+                     -B$(BUILD_DIR) \
+                     -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
+
+
+# -----------------------------------------------------------------------------
 # Build Blender
 all:
 	@echo
 	@echo Configuring Blender ...
 
 	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
+		$(CMAKE_CONFIG); \
 	fi
 
 	@echo
@@ -186,12 +196,15 @@
 #
 
 check_cppcheck:
+	$(CMAKE_CONFIG)
 	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
 
 check_splint:
+	$(CMAKE_CONFIG)
 	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
 
 check_sparse:
+	$(CMAKE_CONFIG)
 	cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
 
 

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-09-20 09:32:14 UTC (rev 40391)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-09-20 10:15:57 UTC (rev 40392)
@@ -1807,7 +1807,7 @@
 /* ********************* mesh ****************** */
 
 /* proportional distance based on connectivity  */
-#define THRESHOLD	0.000000000000001f
+#define THRESHOLD	0.0001f
 
 static int connectivity_edge(float mtx[][3], EditVert *v1, EditVert *v2)
 {