Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

committed change to transforms THRESHOLD by accident, also update convenience makefile to regenerate real makefiles before static checking.

Browse Source
This commit is contained in:
Campbell Barton
2011-09-20 10:15:57 +00:00
parent 84d06f252e
commit 78d4260144
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
GNUmakefile
View File

@@ -36,7 +36,7 @@ OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
BLENDER_DIR:=$(shell pwd -P) BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE) BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
BUILD_TYPE:=Release BUILD_TYPE:=Release
BUILD_CMAKE_ARGS:="" BUILD_CMAKE_ARGS:=
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -77,6 +77,16 @@ ifeq ($(OS), NetBSD)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 ) NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif 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 # Build Blender
all: all:
@@ -84,7 +94,7 @@ all:
@echo Configuring Blender ... @echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ 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 fi
@echo @echo
@@ -186,12 +196,15 @@ project_eclipse:
# #
check_cppcheck: check_cppcheck:
$(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
check_splint: check_splint:
$(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
check_sparse: check_sparse:
$(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py

2
source/blender/editors/transform/transform_conversions.c
View File

@@ -1807,7 +1807,7 @@ void flushTransParticles(TransInfo *t)
/* ********************* mesh ****************** */ /* ********************* mesh ****************** */
/* proportional distance based on connectivity */ /* proportional distance based on connectivity */
#define THRESHOLD 0.000000000000001f #define THRESHOLD 0.0001f
static int connectivity_edge(float mtx[][3], EditVert *v1, EditVert *v2) static int connectivity_edge(float mtx[][3], EditVert *v1, EditVert *v2)
{ {