0033141: BVH_BaseBox<T, 3, BVH_Box>::Transformed() returns empty box for identity matrix

2025-08-14 13:30:48 +03:00 · 2022-09-13 13:01:00 +03:00
865 changed files with 10280 additions and 17098 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -820,6 +820,12 @@ else()
  OCCT_CHECK_AND_UNSET ("3RDPARTY_DOT_EXECUTABLE")
 endif()

+# ExpToCasExe
+if (EMSCRIPTEN)
+  list (REMOVE_ITEM BUILD_TOOLKITS TKExpress)
+  list (REMOVE_ITEM BUILD_TOOLKITS ExpToCasExe)
+endif()
+
 # bison
 if (BUILD_YACCLEX)
  OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/bison")
--- a/adm/MODULES
+++ b/adm/MODULES
@@ -3,6 +3,5 @@ ModelingData TKG2d TKG3d TKGeomBase TKBRep
 ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing
 Visualization TKService TKV3d TKOpenGl TKOpenGles TKMeshVS TKIVtk TKD3DHost
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKTObj TKBinTObj TKXmlTObj TKVCAF
-DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade
+DataExchange TKXDE TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF TKRWMesh TKXDECascade TKExpress ExpToCasExe
 Draw TKDraw TKTopTest TKOpenGlTest TKOpenGlesTest TKD3DHostTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
-DETools TKExpress ExpToCasExe
--- a/adm/cmake/cotire.cmake
+++ b/adm/cmake/cotire.cmake
@@ -3,7 +3,7 @@
 # See the cotire manual for usage hints.
 #
 #=============================================================================
-# Copyright 2012-2018 Sascha Kratky
+# Copyright 2012-2016 Sascha Kratky
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation
@@ -32,18 +32,16 @@ if(__COTIRE_INCLUDED)
 endif()
 set(__COTIRE_INCLUDED TRUE)

-# call cmake_minimum_required, but prevent modification of the CMake policy stack in include mode
-# cmake_minimum_required also sets the policy version as a side effect, which we have to avoid
-if (NOT CMAKE_SCRIPT_MODE_FILE)
-	cmake_policy(PUSH)
-endif()
-cmake_minimum_required(VERSION 2.8.12)
-if (NOT CMAKE_SCRIPT_MODE_FILE)
-	cmake_policy(POP)
-endif()
+# Caution! Be careful, when increase minimal cmake version:
+# using of newer version may leads (by default) to applying
+# of some new policies. It may break compilation.
+# For canceling of applying new policies use:
+# cmake_policy(PUSH) before `cmake_minimum_required`
+# and cmake_policy(POP) after.
+cmake_minimum_required(VERSION 3.1 FATAL_ERROR)

 set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
-set (COTIRE_CMAKE_MODULE_VERSION "1.8.1")
+set (COTIRE_CMAKE_MODULE_VERSION "1.7.9")

 # activate select policies
 if (POLICY CMP0025)
@@ -106,11 +104,6 @@ if (POLICY CMP0054)
 	cmake_policy(SET CMP0054 NEW)
 endif()

-if (POLICY CMP0055)
-	# strict checking for break() command
-	cmake_policy(SET CMP0055 NEW)
-endif()
-
 include(CMakeParseArguments)
 include(ProcessorCount)

@@ -239,13 +232,7 @@ function (cotire_filter_language_source_files _language _target _sourceFilesVar
 				# add to excluded sources, if file has custom compile flags
 				list (APPEND _excludedSourceFiles "${_sourceFile}")
 			else()
-				get_source_file_property(_sourceCompileOptions "${_sourceFile}" COMPILE_OPTIONS)
-				if (_sourceCompileOptions)
-					# add to excluded sources, if file has list of custom compile options
-					list (APPEND _excludedSourceFiles "${_sourceFile}")
-				else()
-					list (APPEND _sourceFiles "${_sourceFile}")
-				endif()
+				list (APPEND _sourceFiles "${_sourceFile}")
 			endif()
 		endif()
 	endforeach()
@@ -304,7 +291,7 @@ function (cotire_get_source_file_property_values _valuesVar _property)
 	set (${_valuesVar} ${_values} PARENT_SCOPE)
 endfunction()

-function (cotire_resolve_config_properties _configurations _propertiesVar)
+function (cotire_resolve_config_properites _configurations _propertiesVar)
 	set (_properties "")
 	foreach (_property ${ARGN})
 		if ("${_property}" MATCHES "<CONFIG>")
@@ -320,8 +307,8 @@ function (cotire_resolve_config_properties _configurations _propertiesVar)
 	set (${_propertiesVar} ${_properties} PARENT_SCOPE)
 endfunction()

-function (cotire_copy_set_properties _configurations _type _source _target)
-	cotire_resolve_config_properties("${_configurations}" _properties ${ARGN})
+function (cotire_copy_set_properites _configurations _type _source _target)
+	cotire_resolve_config_properites("${_configurations}" _properties ${ARGN})
 	foreach (_property ${_properties})
 		get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET)
 		if (_isSet)
@@ -331,18 +318,13 @@ function (cotire_copy_set_properties _configurations _type _source _target)
 	endforeach()
 endfunction()

-function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar)
+function (cotire_get_target_usage_requirements _target _targetRequirementsVar)
 	set (_targetRequirements "")
 	get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES)
 	while (_librariesToProcess)
 		# remove from head
 		list (GET _librariesToProcess 0 _library)
 		list (REMOVE_AT _librariesToProcess 0)
-		if (_library MATCHES "^\\$<\\$<CONFIG:${_config}>:([A-Za-z0-9_:-]+)>$")
-			set (_library "${CMAKE_MATCH_1}")
-		elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$<CONFIG:>:([A-Za-z0-9_:-]+)>$")
-			set (_library "${CMAKE_MATCH_1}")
-		endif()
 		if (TARGET ${_library})
 			list (FIND _targetRequirements ${_library} _index)
 			if (_index LESS 0)
@@ -457,7 +439,7 @@ function (cotire_get_target_compile_flags _config _language _target _flagsVar)
 	# interface compile options from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS)
 			if (_targetOptions)
@@ -589,7 +571,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
 	# interface include directories from linked library targets
 	if (_target)
 		set (_linkedTargets "")
-		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		cotire_get_target_usage_requirements(${_target} _linkedTargets)
 		foreach (_linkedTarget ${_linkedTargets})
 			get_target_property(_linkedTargetType ${_linkedTarget} TYPE)
 			if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND
@@ -643,7 +625,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
 	if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
 		list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
 	endif()
-	if (WIN32 AND NOT MINGW)
+	if (WIN32)
 		# convert Windows paths in include directories to CMake paths
 		if (_includeDirs)
 			set (_paths "")
@@ -719,7 +701,7 @@ function (cotire_get_target_compile_definitions _config _language _target _defin
 	endif()
 	# interface compile definitions from linked library targets
 	set (_linkedTargets "")
-	cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+	cotire_get_target_usage_requirements(${_target} _linkedTargets)
 	foreach (_linkedTarget ${_linkedTargets})
 		get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS)
 		if (_definitions)
@@ -727,7 +709,7 @@ function (cotire_get_target_compile_definitions _config _language _target _defin
 		endif()
 	endforeach()
 	# parse additional compile definitions from target compile flags
-	# and do not look at directory compile definitions, which we already handled
+	# and don't look at directory compile definitions, which we already handled
 	set (_targetFlags "")
 	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
 	cotire_filter_compile_flags("${_language}" "D" _definitions _ignore ${_targetFlags})
@@ -875,9 +857,6 @@ macro (cotire_set_cmd_to_prologue _cmdVar)
 		list (APPEND ${_cmdVar} "--warn-uninitialized")
 	endif()
 	list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$<CONFIGURATION>")
-	if (XCODE)
-		list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE")
-	endif()
 	if (COTIRE_VERBOSE)
 		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON")
 	elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles")
@@ -895,9 +874,6 @@ function (cotire_init_compile_cmd _cmdVar _language _compilerLauncher _compilerE
 	if (NOT _compilerArg1)
 		set (_compilerArg1 ${CMAKE_${_language}_COMPILER_ARG1})
 	endif()
-	if (WIN32)
-		file (TO_NATIVE_PATH "${_compilerExe}" _compilerExe)
-	endif()
 	string (STRIP "${_compilerArg1}" _compilerArg1)
 	if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
 		# compiler launcher is only supported for Makefile and Ninja
@@ -924,16 +900,16 @@ function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemInclu
 		foreach (_include ${_includeDirs})
 			if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
 				file (TO_NATIVE_PATH "${_include}" _include)
-				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
 			else()
 				set (_index -1)
 				if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+")
 					list (FIND ${_systemIncludesVar} "${_include}" _index)
 				endif()
 				if (_index GREATER -1)
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${_include}")
 				else()
-					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_${_language}_SEP}${_include}")
 				endif()
 			endif()
 		endforeach()
@@ -1068,10 +1044,10 @@ macro (cotire_check_ignore_header_file_path _headerFile _headerIsIgnoredVar)
 		set (${_headerIsIgnoredVar} TRUE)
 	elseif (IS_DIRECTORY "${_headerFile}")
 		set (${_headerIsIgnoredVar} TRUE)
-	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed")
-		# heuristic: ignore headers with embedded parent directory references or "-fixed" or "_fixed" in path
+	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed" AND "${_headerFile}" MATCHES "\\.h$")
+		# heuristic: ignore C headers with embedded parent directory references or "-fixed" or "_fixed" in path
 		# these often stem from using GCC #include_next tricks, which may break the precompiled header compilation
-		# with the error message "error: no include path in which to search for header"
+		# with the error message "error: no include path in which to search for header.h"
 		set (${_headerIsIgnoredVar} TRUE)
 	else()
 		set (${_headerIsIgnoredVar} FALSE)
@@ -1092,11 +1068,12 @@ endmacro()

 macro (cotire_parse_line _line _headerFileVar _headerDepthVar)
 	if (MSVC)
-		# cl.exe /showIncludes produces different output, depending on the language pack used, e.g.:
+		# cl.exe /showIncludes output looks different depending on the language pack used, e.g.:
 		# English: "Note: including file:   C:\directory\file"
 		# German: "Hinweis: Einlesen der Datei:   C:\directory\file"
 		# We use a very general regular expression, relying on the presence of the : characters
 		if (_line MATCHES "( +)([a-zA-Z]:[^:]+)$")
+			# Visual Studio compiler output
 			string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
 			get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE)
 		else()
@@ -1254,19 +1231,11 @@ function (cotire_scan_includes _includesVar)
 		set (${_includesVar} "" PARENT_SCOPE)
 		return()
 	endif()
-	# add source files to be scanned
-	if (WIN32)
-		foreach (_sourceFile ${_existingSourceFiles})
-			file (TO_NATIVE_PATH "${_sourceFile}" _sourceFileNative)
-			list (APPEND _cmd "${_sourceFileNative}")
-		endforeach()
-	else()
-		list (APPEND _cmd ${_existingSourceFiles})
-	endif()
+	list (APPEND _cmd ${_existingSourceFiles})
 	if (COTIRE_VERBOSE)
 		message (STATUS "execute_process: ${_cmd}")
 	endif()
-	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
+	if (_option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
 	endif()
@@ -1502,16 +1471,11 @@ function (cotire_generate_prefix_header _prefixFile)
 	if (_unparsedLines)
 		if (COTIRE_VERBOSE OR _scanResult OR NOT _selectedHeaders)
 			list (LENGTH _unparsedLines _skippedLineCount)
-			if (WIN32)
-				file (TO_NATIVE_PATH "${_unparsedLinesFile}" _unparsedLinesLogPath)
-			else()
-				set (_unparsedLinesLogPath "${_unparsedLinesFile}")
-			endif()
-			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesLogPath}")
+			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesFile}")
 		endif()
 		string (REPLACE ";" "\n" _unparsedLines "${_unparsedLines}")
 	endif()
-	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}\n")
+	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}")
 endfunction()

 function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flagsVar)
@@ -1541,7 +1505,7 @@ function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flags
 			# append to list
 			list (APPEND _flags -H -E)
 			if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0")
-				list (APPEND _flags -fdirectives-only)
+				list (APPEND _flags "-fdirectives-only")
 			endif()
 		else()
 			# return as a flag string
@@ -1551,36 +1515,16 @@ function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flags
 			endif()
 		endif()
 	elseif (_compilerID MATCHES "Clang")
-		if (UNIX)
-			# Clang options used
-			# -H print the name of each header file used
-			# -E invoke preprocessor
-			# -fno-color-diagnostics do not print diagnostics in color
-			# -Eonly just run preprocessor, no output
-			if (_flags)
-				# append to list
-				list (APPEND _flags -H -E -fno-color-diagnostics -Xclang -Eonly)
-			else()
-				# return as a flag string
-				set (_flags "-H -E -fno-color-diagnostics -Xclang -Eonly")
-			endif()
-		elseif (WIN32)
-			# Clang-cl.exe options used
-			# /TC treat all files named on the command line as C source files
-			# /TP treat all files named on the command line as C++ source files
-			# /EP preprocess to stdout without #line directives
-			# -H print the name of each header file used
-			# -fno-color-diagnostics do not print diagnostics in color
-			# -Eonly just run preprocessor, no output
-			set (_sourceFileTypeC "/TC")
-			set (_sourceFileTypeCXX "/TP")
-			if (_flags)
-				# append to list
-				list (APPEND _flags "${_sourceFileType${_language}}" /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly)
-			else()
-				# return as a flag string
-				set (_flags "${_sourceFileType${_language}} /EP -fno-color-diagnostics -Xclang -H -Xclang -Eonly")
-			endif()
+		# Clang options used
+		# -H print the name of each header file used
+		# -E invoke preprocessor
+		# -fno-color-diagnostics don't prints diagnostics in color
+		if (_flags)
+			# append to list
+			list (APPEND _flags -H -E -fno-color-diagnostics)
+		else()
+			# return as a flag string
+			set (_flags "-H -E -fno-color-diagnostics")
 		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
@@ -1654,8 +1598,8 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 				set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
 			endif()
 		endif()
-	elseif (_compilerID MATCHES "GNU")
-		# GCC options used
+	elseif (_compilerID MATCHES "GNU|Clang")
+		# GCC / Clang options used
 		# -x specify the source language
 		# -c compile but do not link
 		# -o place output in file
@@ -1665,55 +1609,11 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 		set (_xLanguage_CXX "c++-header")
 		if (_flags)
 			# append to list
-			list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
+			list (APPEND _flags "-x" "${_xLanguage_${_language}}" "-c" "${_prefixFile}" -o "${_pchFile}")
 		else()
 			# return as a flag string
 			set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
 		endif()
-	elseif (_compilerID MATCHES "Clang")
-		if (UNIX)
-			# Clang options used
-			# -x specify the source language
-			# -c compile but do not link
-			# -o place output in file
-			# -fno-pch-timestamp disable inclusion of timestamp in precompiled headers (clang 4.0.0+)
-			set (_xLanguage_C "c-header")
-			set (_xLanguage_CXX "c++-header")
-			if (_flags)
-				# append to list
-				list (APPEND _flags -x "${_xLanguage_${_language}}" -c "${_prefixFile}" -o "${_pchFile}")
-				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
-					list (APPEND _flags -Xclang -fno-pch-timestamp)
-				endif()
-			else()
-				# return as a flag string
-				set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
-				if (NOT "${_compilerVersion}" VERSION_LESS "4.0.0")
-					set (_flags "${_flags} -Xclang -fno-pch-timestamp")
-				endif()
-			endif()
-		elseif (WIN32)
-			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
-			file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
-			file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative)
-			# Clang-cl.exe options used
-			# /Yc creates a precompiled header file
-			# /Fp specifies precompiled header binary file name
-			# /FI forces inclusion of file
-			# /Zs syntax check only
-			# /TC treat all files named on the command line as C source files
-			# /TP treat all files named on the command line as C++ source files
-			set (_sourceFileTypeC "/TC")
-			set (_sourceFileTypeCXX "/TP")
-			if (_flags)
-				# append to list
-				list (APPEND _flags "${_sourceFileType${_language}}"
-						"/Yc${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}")
-			else()
-				# return as a flag string
-				set (_flags "/Yc\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
-			endif()
-		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
 			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
@@ -1755,28 +1655,20 @@ function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersio
 			get_filename_component(_pchName "${_pchFile}" NAME)
 			set (_xLanguage_C "c-header")
 			set (_xLanguage_CXX "c++-header")
-			set (_pchSuppressMessages FALSE)
-			if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
-				set(_pchSuppressMessages TRUE)
-			endif()
 			if (_flags)
 				# append to list
 				if ("${_language}" STREQUAL "CXX")
 					list (APPEND _flags -Kc++)
 				endif()
-				list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-create "${_pchName}" -fsyntax-only "${_hostFile}")
+				list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-create" "${_pchName}" "-fsyntax-only" "${_hostFile}")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					if (NOT _pchSuppressMessages)
-						list (APPEND _flags -Wpch-messages)
-					endif()
+					list (APPEND _flags "-Wpch-messages")
 				endif()
 			else()
 				# return as a flag string
 				set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"")
 				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-					if (NOT _pchSuppressMessages)
-						set (_flags "${_flags} -Wpch-messages")
-					endif()
+					set (_flags "${_flags} -Wpch-messages")
 				endif()
 			endif()
 		endif()
@@ -1827,48 +1719,23 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
 		if (_flags)
 			# append to list
-			list (APPEND _flags -Winvalid-pch -include "${_prefixFile}")
+			list (APPEND _flags "-Winvalid-pch" "-include" "${_prefixFile}")
 		else()
 			# return as a flag string
 			set (_flags "-Winvalid-pch -include \"${_prefixFile}\"")
 		endif()
 	elseif (_compilerID MATCHES "Clang")
-		if (UNIX)
-			# Clang options used
-			# -include process include file as the first line of the primary source file
-			# note: ccache requires the -include flag to be used in order to process precompiled header correctly
-			if (_flags)
-				# append to list
-				list (APPEND _flags -include "${_prefixFile}")
-			else()
-				# return as a flag string
-				set (_flags "-include \"${_prefixFile}\"")
-			endif()
-		elseif (WIN32)
-			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
-			# Clang-cl.exe options used
-			# /Yu uses a precompiled header file during build
-			# /Fp specifies precompiled header binary file name
-			# /FI forces inclusion of file
-			if (_pchFile)
-				file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
-				if (_flags)
-					# append to list
-					list (APPEND _flags "/Yu${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}")
-				else()
-					# return as a flag string
-					set (_flags "/Yu\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
-				endif()
-			else()
-				# no precompiled header, force inclusion of prefix header
-				if (_flags)
-					# append to list
-					list (APPEND _flags "/FI${_prefixFileNative}")
-				else()
-					# return as a flag string
-					set (_flags "/FI\"${_prefixFileNative}\"")
-				endif()
-			endif()
+		# Clang options used
+		# -include process include file as the first line of the primary source file
+		# -include-pch include precompiled header file
+		# -Qunused-arguments don't emit warning for unused driver arguments
+		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
+		if (_flags)
+			# append to list
+			list (APPEND _flags "-Qunused-arguments" "-include" "${_prefixFile}")
+		else()
+			# return as a flag string
+			set (_flags "-Qunused-arguments -include \"${_prefixFile}\"")
 		endif()
 	elseif (_compilerID MATCHES "Intel")
 		if (WIN32)
@@ -1912,32 +1779,24 @@ function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerV
 			if (_pchFile)
 				get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
 				get_filename_component(_pchName "${_pchFile}" NAME)
-				set (_pchSuppressMessages FALSE)
-				if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
-					set(_pchSuppressMessages TRUE)
-				endif()
 				if (_flags)
 					# append to list
-					list (APPEND _flags -include "${_prefixFile}" -pch-dir "${_pchDir}" -pch-use "${_pchName}")
+					list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-use" "${_pchName}")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						if (NOT _pchSuppressMessages)
-							list (APPEND _flags -Wpch-messages)
-						endif()
+						list (APPEND _flags "-Wpch-messages")
 					endif()
 				else()
 					# return as a flag string
 					set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"")
 					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
-						if (NOT _pchSuppressMessages)
-							set (_flags "${_flags} -Wpch-messages")
-						endif()
+						set (_flags "${_flags} -Wpch-messages")
 					endif()
 				endif()
 			else()
 				# no precompiled header, force inclusion of prefix header
 				if (_flags)
 					# append to list
-					list (APPEND _flags -include "${_prefixFile}")
+					list (APPEND _flags "-include" "${_prefixFile}")
 				else()
 					# return as a flag string
 					set (_flags "-include \"${_prefixFile}\"")
@@ -1975,17 +1834,9 @@ function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile)
 	if (COTIRE_VERBOSE)
 		message (STATUS "execute_process: ${_cmd}")
 	endif()
-	if (MSVC_IDE OR _option_COMPILER_ID MATCHES "MSVC")
+	if (_option_COMPILER_ID MATCHES "MSVC")
 		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
 		unset (ENV{VS_UNICODE_OUTPUT})
-	elseif (_option_COMPILER_ID MATCHES "Clang" AND _option_COMPILER_VERSION VERSION_LESS "4.0.0")
-		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
-			_option_COMPILER_EXECUTABLE MATCHES "ccache")
-			# Newer versions of Clang embed a compilation timestamp into the precompiled header binary,
-			# which results in "file has been modified since the precompiled header was built" errors if ccache is used.
-			# We work around the problem by disabling ccache upon pre-compiling the prefix header.
-			set (ENV{CCACHE_DISABLE} "true")
-		endif()
 	endif()
 	execute_process(
 		COMMAND ${_cmd}
@@ -2000,7 +1851,7 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 	set (_unsupportedCompiler
 		"Precompiled headers not supported for ${_language} compiler ${CMAKE_${_language}_COMPILER_ID}")
 	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC")
-		# PCH supported since Visual Studio C++ 6.0
+		# supported since Visual Studio C++ 6.0
 		# and CMake does not support an earlier version
 		set (${_msgVar} "" PARENT_SCOPE)
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU")
@@ -2011,16 +1862,8 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 			set (${_msgVar} "" PARENT_SCOPE)
 		endif()
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang")
-		if (UNIX)
-			# all Unix Clang versions have PCH support
-			set (${_msgVar} "" PARENT_SCOPE)
-		elseif (WIN32)
-			# only clang-cl is supported under Windows
-			get_filename_component(_compilerName "${CMAKE_${_language}_COMPILER}" NAME_WE)
-			if (NOT _compilerName MATCHES "cl$")
-				set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}. Use clang-cl instead." PARENT_SCOPE)
-			endif()
-		endif()
+		# all Clang versions have PCH support
+		set (${_msgVar} "" PARENT_SCOPE)
 	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel")
 		# Intel PCH support requires version >= 8.0.0
 		if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "8.0.0")
@@ -2031,38 +1874,29 @@ function (cotire_check_precompiled_header_support _language _target _msgVar)
 	else()
 		set (${_msgVar} "${_unsupportedCompiler}." PARENT_SCOPE)
 	endif()
-	# check if ccache is used as a compiler launcher
 	get_target_property(_launcher ${_target} ${_language}_COMPILER_LAUNCHER)
-	get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" REALPATH)
-	if (_realCompilerExe MATCHES "ccache" OR _launcher MATCHES "ccache")
-		# verify that ccache configuration is compatible with precompiled headers
-		# always check environment variable CCACHE_SLOPPINESS, because earlier versions of ccache
-		# do not report the "sloppiness" setting correctly upon printing ccache configuration
+	if (CMAKE_${_language}_COMPILER MATCHES "ccache" OR _launcher MATCHES "ccache")
 		if (DEFINED ENV{CCACHE_SLOPPINESS})
-			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR
-				NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
+			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
 				set (${_msgVar}
 					"ccache requires the environment variable CCACHE_SLOPPINESS to be set to \"pch_defines,time_macros\"."
 					PARENT_SCOPE)
 			endif()
 		else()
-			if (_realCompilerExe MATCHES "ccache")
-				set (_ccacheExe "${_realCompilerExe}")
+			if (_launcher MATCHES "ccache")
+				get_filename_component(_ccacheExe "${_launcher}" REALPATH)
 			else()
-				set (_ccacheExe "${_launcher}")
+				get_filename_component(_ccacheExe "${CMAKE_${_language}_COMPILER}" REALPATH)
 			endif()
-			# ccache 3.7.0 replaced --print-config with --show-config
-			# use -p instead, which seems to work for all version for now, sigh
 			execute_process(
-				COMMAND "${_ccacheExe}" "-p"
+				COMMAND "${_ccacheExe}" "--print-config"
 				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 				RESULT_VARIABLE _result
 				OUTPUT_VARIABLE _ccacheConfig OUTPUT_STRIP_TRAILING_WHITESPACE
 				ERROR_QUIET)
-			if (_result)
-				set (${_msgVar} "ccache configuration cannot be determined." PARENT_SCOPE)
-			elseif (NOT _ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR
-				NOT _ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
+			if (_result OR NOT
+				_ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR NOT
+				_ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
 				set (${_msgVar}
 					"ccache requires configuration setting \"sloppiness\" to be set to \"pch_defines,time_macros\"."
 					PARENT_SCOPE)
@@ -2355,7 +2189,7 @@ function (cotire_generate_target_script _language _configurations _target _targe
 		XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES
 		CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION
 		CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1
-		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language}
+		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_${_language}_SEP
 		CMAKE_INCLUDE_SYSTEM_FLAG_${_language}
 		CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG
 		CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG
@@ -2388,9 +2222,8 @@ endfunction()

 function (cotire_setup_pch_file_compilation _language _target _targetScript _prefixFile _pchFile _hostFile)
 	set (_sourceFiles ${ARGN})
-	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
-		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
-		# for MSVC, Intel and Clang-cl, we attach the precompiled header compilation to the host file
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		# for Visual Studio and Intel, we attach the precompiled header compilation to the host file
 		# the remaining files include the precompiled header, see cotire_setup_pch_file_inclusion
 		if (_sourceFiles)
 			set (_flags "")
@@ -2398,9 +2231,6 @@ function (cotire_setup_pch_file_compilation _language _target _targetScript _pre
 				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 				"${_prefixFile}" "${_pchFile}" "${_hostFile}" _flags)
 			set_property (SOURCE ${_hostFile} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-			if (COTIRE_DEBUG)
-				message (STATUS "set_property: SOURCE ${_hostFile} APPEND_STRING COMPILE_FLAGS ${_flags}")
-			endif()
 			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_OUTPUTS "${_pchFile}")
 			# make object file generated from host file depend on prefix header
 			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}")
@@ -2438,9 +2268,8 @@ function (cotire_setup_pch_file_compilation _language _target _targetScript _pre
 endfunction()

 function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefixFile _pchFile _hostFile)
-	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" OR
-		(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
-		# for MSVC, Intel and clang-cl, we include the precompiled header in all but the host file
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		# for Visual Studio and Intel, we include the precompiled header in all but the host file
 		# the host file does the precompiled header compilation, see cotire_setup_pch_file_compilation
 		set (_sourceFiles ${ARGN})
 		list (LENGTH _sourceFiles _numberOfSourceFiles)
@@ -2452,9 +2281,6 @@ function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefix
 				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 				"${_prefixFile}" "${_pchFile}" _flags)
 			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-			if (COTIRE_DEBUG)
-				message (STATUS "set_property: SOURCE ${_sourceFiles} APPEND_STRING COMPILE_FLAGS ${_flags}")
-			endif()
 			# make object files generated from source files depend on precompiled header
 			set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}")
 		endif()
@@ -2468,9 +2294,6 @@ function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefix
 				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 				"${_prefixFile}" "${_pchFile}" _flags)
 			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-			if (COTIRE_DEBUG)
-				message (STATUS "set_property: SOURCE ${_sourceFiles} APPEND_STRING COMPILE_FLAGS ${_flags}")
-			endif()
 			# mark sources as cotired to prevent them from being used in another cotired target
 			set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
 		endif()
@@ -2488,9 +2311,6 @@ function (cotire_setup_prefix_file_inclusion _language _target _prefixFile)
 		"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 		"${_prefixFile}" "${_pchFile}" _flags)
 	set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
-	if (COTIRE_DEBUG)
-		message (STATUS "set_property: SOURCE ${_sourceFiles} APPEND_STRING COMPILE_FLAGS ${_flags}")
-	endif()
 	# mark sources as cotired to prevent them from being used in another cotired target
 	set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
 	# make object files generated from source files depend on prefix header
@@ -2580,7 +2400,7 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 			message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}")
 		endif()
 		# because CMake PRE_BUILD command does not support dependencies,
-		# we check dependencies explicity in cotire script mode when the pre-build action is run
+		# we check dependencies explicitly in cotire script mode when the pre-build action is run
 		add_custom_command(
 			TARGET "${_target}"
 			PRE_BUILD ${_cmds}
@@ -2595,10 +2415,9 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 		# if this is a single-language target without any excluded files
 		if (_wholeTarget)
 			set (_language "${_languages}")
-			# for MSVC, Intel and clang-cl, precompiled header inclusion is always done on the source file level
+			# for Visual Studio and Intel, precompiled header inclusion is always done on the source file level
 			# see cotire_setup_pch_file_inclusion
-			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
-				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
 				get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
 				if (_prefixFile)
 					get_property(_pchFile TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER)
@@ -2607,9 +2426,6 @@ function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
 						"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
 						"${_prefixFile}" "${_pchFile}" _options)
 					set_property(TARGET ${_target} APPEND PROPERTY ${_options})
-					if (COTIRE_DEBUG)
-						message (STATUS "set_property: TARGET ${_target} APPEND PROPERTY ${_options}")
-					endif()
 				endif()
 			endif()
 		endif()
@@ -2636,8 +2452,7 @@ function (cotire_setup_unity_generation_commands _language _target _targetScript
 			set_property (SOURCE "${_unityFile}" PROPERTY OBJECT_DEPENDS ${_objectDependsPaths})
 		endif()
 		if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
-			# unity file compilation results in potentially huge object file,
-			# thus use /bigobj by default unter cl.exe and Windows Intel
+			# unity file compilation results in potentially huge object file, thus use /bigobj by default unter MSVC and Windows Intel
 			set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj")
 		endif()
 		cotire_set_cmd_to_prologue(_unityCmd)
@@ -2843,9 +2658,6 @@ function (cotire_make_target_message _target _languages _disableMsg _targetMsgVa
 		else()
 			set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build.")
 		endif()
-		if (_disableMsg)
-			set (_targetMsg "${_targetMsg} ${_disableMsg}")
-		endif()
 	else()
 		if (_excludedStr)
 			set (_targetMsg "${_languagesStr} target ${_target} cotired ${_excludedStr}.")
@@ -2935,20 +2747,6 @@ function (cotire_choose_target_languages _target _targetLanguagesVar _wholeTarge
 			set (_targetUsePCH FALSE)
 		endif()
 	endif()
-	if (_targetAddSCU)
-		# disable unity builds if automatic Qt processing is used
-		get_target_property(_targetAutoMoc ${_target} AUTOMOC)
-		get_target_property(_targetAutoUic ${_target} AUTOUIC)
-		get_target_property(_targetAutoRcc ${_target} AUTORCC)
-		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
-			if (_disableMsg)
-				set (_disableMsg "${_disableMsg} Target uses automatic CMake Qt processing.")
-			else()
-				set (_disableMsg "Target uses automatic CMake Qt processing.")
-			endif()
-			set (_targetAddSCU FALSE)
-		endif()
-	endif()
 	set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${_targetUsePCH})
 	set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD ${_targetAddSCU})
 	cotire_make_target_message(${_target} "${_targetLanguages}" "${_disableMsg}" _targetMsg ${_allExcludedSourceFiles})
@@ -2976,11 +2774,7 @@ function (cotire_compute_unity_max_number_of_includes _target _maxIncludesVar)
 	set (_sourceFiles ${ARGN})
 	get_target_property(_maxIncludes ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
 	if (_maxIncludes MATCHES "(-j|--parallel|--jobs) ?([0-9]*)")
-		if (DEFINED CMAKE_MATCH_2)
-			set (_numberOfThreads "${CMAKE_MATCH_2}")
-		else()
-			set (_numberOfThreads "")
-		endif()
+		set (_numberOfThreads "${CMAKE_MATCH_2}")
 		if (NOT _numberOfThreads)
 			# use all available cores
 			ProcessorCount(_numberOfThreads)
@@ -3093,9 +2887,8 @@ function (cotire_setup_pch_target _languages _configurations _target)
 		set (_dependsFiles "")
 		foreach (_language ${_languages})
 			set (_props COTIRE_${_language}_PREFIX_HEADER COTIRE_${_language}_UNITY_SOURCE)
-			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel" AND NOT
-				(WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "Clang"))
-				# MSVC, Intel and clang-cl only create precompiled header as a side effect
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+				# Visual Studio and Intel only create precompiled header as a side effect
 				list (INSERT _props 0 COTIRE_${_language}_PRECOMPILED_HEADER)
 			endif()
 			cotire_get_first_set_property_value(_dependsFile TARGET ${_target} ${_props})
@@ -3143,7 +2936,6 @@ function (cotire_collect_unity_target_sources _target _languages _unityTargetSou
 			list (APPEND _unityTargetSources ${_unityFiles})
 		endif()
 	endforeach()
-	# handle object libraries which are part of the target's sources
 	get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT)
 	if ("${_linkLibrariesStrategy}" MATCHES "^COPY_UNITY$")
 		cotire_filter_object_libraries(${_target} _objectLibraries ${_targetSourceFiles})
@@ -3188,6 +2980,21 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	# determine unity target sources
 	set (_unityTargetSources "")
 	cotire_collect_unity_target_sources(${_target} "${_languages}" _unityTargetSources)
+	# handle automatic Qt processing
+	get_target_property(_targetAutoMoc ${_target} AUTOMOC)
+	get_target_property(_targetAutoUic ${_target} AUTOUIC)
+	get_target_property(_targetAutoRcc ${_target} AUTORCC)
+	if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+		# if the original target sources are subject to CMake's automatic Qt processing,
+		# also include implicitly generated <targetname>_automoc.cpp file
+		if (CMAKE_VERSION VERSION_LESS "3.8.0")
+			list (APPEND _unityTargetSources "${_target}_automoc.cpp")
+			set_property (SOURCE "${_target}_automoc.cpp" PROPERTY GENERATED TRUE)
+		else()
+			list (APPEND _unityTargetSources "${_target}_autogen/moc_compilation.cpp")
+			set_property (SOURCE "${_target}_autogen/moc_compilation.cpp" PROPERTY GENERATED TRUE)
+		endif()
+	endif()
 	# prevent AUTOMOC, AUTOUIC and AUTORCC properties from being set when the unity target is created
 	set (CMAKE_AUTOMOC OFF)
 	set (CMAKE_AUTOUIC OFF)
@@ -3201,6 +3008,21 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 	else()
 		add_library(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources})
 	endif()
+	if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+		# depend on original target's automoc target, if it exists
+		if (TARGET ${_target}_automoc)
+			add_dependencies(${_unityTargetName} ${_target}_automoc)
+		endif()
+	else()
+		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+			# depend on the original target's implicitly generated <targetname>_automoc target
+			if (CMAKE_VERSION VERSION_LESS "3.8.0")
+				add_dependencies(${_unityTargetName} ${_target}_automoc)
+			else()
+				add_dependencies(${_unityTargetName} ${_target}_autogen)
+			endif()
+		endif()
+	endif()
 	# copy output location properties
 	set (_outputDirProperties
 		ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>
@@ -3212,8 +3034,8 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 			set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
 		else()
 			# append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory
-			cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
-			cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties})
+			cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
+			cotire_resolve_config_properites("${_configurations}" _properties ${_outputDirProperties})
 			foreach (_property ${_properties})
 				get_property(_outputDir TARGET ${_target} PROPERTY ${_property})
 				if (_outputDir)
@@ -3233,11 +3055,11 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 				RUNTIME_OUTPUT_DIRECTORY "${_outputDir}")
 		endif()
 	else()
-		cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 			${_outputDirProperties})
 	endif()
 	# copy output name
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_<CONFIG>
 		LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_<CONFIG>
 		OUTPUT_NAME OUTPUT_NAME_<CONFIG>
@@ -3245,7 +3067,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		PREFIX <CONFIG>_POSTFIX SUFFIX
 		IMPORT_PREFIX IMPORT_SUFFIX)
 	# copy compile stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPILE_DEFINITIONS COMPILE_DEFINITIONS_<CONFIG>
 		COMPILE_FLAGS COMPILE_OPTIONS
 		Fortran_FORMAT Fortran_MODULE_DIRECTORY
@@ -3257,12 +3079,12 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN
 		C_CLANG_TIDY CXX_CLANG_TIDY)
 	# copy compile features
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED
 		CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED
 		COMPILE_FEATURES)
 	# copy interface stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN
 		COMPATIBLE_INTERFACE_STRING
 		INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS
@@ -3270,9 +3092,8 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
 		INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED)
 	# copy link stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
-		BUILD_WITH_INSTALL_RPATH BUILD_WITH_INSTALL_NAME_DIR
-		INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		BUILD_WITH_INSTALL_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
 		LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED
 		LINK_FLAGS LINK_FLAGS_<CONFIG>
 		LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_<CONFIG>
@@ -3280,18 +3101,18 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC
 		STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_<CONFIG>
 		NO_SONAME SOVERSION VERSION
-		LINK_WHAT_YOU_USE BUILD_RPATH)
+		LINK_WHAT_YOU_USE)
 	# copy cmake stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK)
 	# copy Apple platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR
 		MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH
 		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
-		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
+		IOS_INSTALL_COMBINED)
 	# copy Windows platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		GNUtoMS
 		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
 		COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
@@ -3305,19 +3126,15 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 		VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES
 		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
 		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
-		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
+		VS_SDK_REFERENCES)
 	# copy Android platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+	cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
 		ANDROID_API ANDROID_API_MIN ANDROID_GUI
 		ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES
 		ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR
 		ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES
 		ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH
 		ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE)
-	# copy CUDA platform specific stuff
-	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
-		CUDA_PTX_COMPILATION CUDA_SEPARABLE_COMPILATION CUDA_RESOLVE_DEVICE_SYMBOLS
-		CUDA_EXTENSIONS CUDA_STANDARD CUDA_STANDARD_REQUIRED)
 	# use output name from original target
 	get_target_property(_targetOutputName ${_unityTargetName} OUTPUT_NAME)
 	if (NOT _targetOutputName)
@@ -3331,13 +3148,6 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
 			set_property(TARGET ${_unityTargetName} PROPERTY ENABLE_EXPORTS TRUE)
 		endif()
 	endif()
-	# enable parallel compilation for MSVC
-	if (MSVC AND "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
-		list (LENGTH _unityTargetSources _numberOfUnityTargetSources)
-		if (_numberOfUnityTargetSources GREATER 1)
-			set_property(TARGET ${_unityTargetName} APPEND PROPERTY COMPILE_OPTIONS "/MP")
-		endif()
-	endif()
 	cotire_init_target(${_unityTargetName})
 	cotire_add_to_unity_all_target(${_unityTargetName})
 	set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_TARGET_NAME "${_unityTargetName}")
@@ -3496,13 +3306,6 @@ function (cotire_target_link_libraries _target)
 					message (STATUS "unity target ${_unityTargetName} interface link libraries: ${_unityLinkInterfaceLibraries}")
 				endif()
 			endif()
-			get_target_property(_manualDependencies ${_target} MANUALLY_ADDED_DEPENDENCIES)
-			if (_manualDependencies)
-				cotire_map_libraries("${_linkLibrariesStrategy}" _unityManualDependencies ${_manualDependencies})
-				if (_unityManualDependencies)
-					add_dependencies("${_unityTargetName}" ${_unityManualDependencies})
-				endif()
-			endif()
 		endif()
 	endif()
 endfunction(cotire_target_link_libraries)
@@ -3535,9 +3338,9 @@ function (cotire_init_target _targetName)
 		set_target_properties(${_targetName} PROPERTIES FOLDER "${COTIRE_TARGETS_FOLDER}")
 	endif()
 	set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_ALL TRUE)
-	# if (MSVC_IDE)
-	# 	set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
-	# endif()
+	if (MSVC_IDE)
+		set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
+	endif()
 endfunction()

 function (cotire_add_to_pch_all_target _pchTargetName)
@@ -3799,7 +3602,7 @@ else()
 	set (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS "m;mm" CACHE STRING
 		"Ignore sources with the listed file extensions from the generated unity source.")

-	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "2" CACHE STRING
+	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "3" CACHE STRING
 		"Minimum number of sources in target required to enable use of precompiled header.")

 	if (NOT DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT)
@@ -3898,7 +3701,7 @@ else()
 		FULL_DOCS
 			"The variable can be set to an integer > 0."
 			"If a target contains less than that number of source files, cotire will not enable the use of the precompiled header for the target."
-			"If not defined, defaults to 2."
+			"If not defined, defaults to 3."
 	)

 	define_property(
--- a/adm/cmake/draco.cmake
+++ b/adm/cmake/draco.cmake
@@ -3,6 +3,10 @@

 OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")

+if (NOT DEFINED INSTALL_DRACO)
+  set (INSTALL_DRACO OFF CACHE BOOL "${INSTALL_DRACO_DESCR}")
+endif()
+
 if (NOT DEFINED 3RDPARTY_DRACO_DIR)
  set (3RDPARTY_DRACO_DIR "" CACHE PATH "The directory containing Draco")
 endif()
@@ -11,24 +15,14 @@ if (NOT DEFINED 3RDPARTY_DRACO_INCLUDE_DIR)
  set (3RDPARTY_DRACO_INCLUDE_DIR  "" CACHE PATH "The directory containing headers of the Draco")
 endif()

-if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY)
-  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library")
+if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY OR NOT 3RDPARTY_DRACO_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+  set (3RDPARTY_DRACO_LIBRARY "" CACHE FILEPATH "Draco library"  FORCE)
 endif()

 if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR)
  set (3RDPARTY_DRACO_LIBRARY_DIR "" CACHE PATH "The directory containing Draco library")
 endif()

-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "" CACHE FILEPATH "Draco debug library")
-  endif()
-  
-  if (NOT DEFINED 3RDPARTY_DRACO_LIBRARY_DIR_DEBUG)
-    set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "" CACHE PATH "The directory containing Draco debug library")
-  endif()
-endif()
-
 if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
  if (NOT 3RDPARTY_DRACO_DIR OR NOT EXISTS "${3RDPARTY_DRACO_DIR}")
    FIND_PRODUCT_DIR("${3RDPARTY_DIR}" draco DRACO_DIR_NAME)
@@ -38,19 +32,20 @@ if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
  endif()
 endif()

-# header
-if (NOT 3RDPARTY_DRACO_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_DRACO_INCLUDE_DIR}")
-  set (HEADER_NAMES draco)
+if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
+  set (DRACO_INCLUDE_PATH "${3RDPARTY_DRACO_DIR}/include")
+  set (DRACO_LIBRARY_PATH "${3RDPARTY_DRACO_DIR}/lib")
+endif()

-  # set 3RDPARTY_DRACO_INCLUDE_DIR as notfound, otherwise find_path can't assign a new value to 3RDPARTY_DRACO_INCLUDE_DIR
-  set (3RDPARTY_DRACO_INCLUDE_DIR "3RDPARTY_DRACO_INCLUDE_DIR-NOTFOUND" CACHE FILEPATH "The directory containing headers of the Draco" FORCE)
+if (NOT 3RDPARTY_DRACO_INCLUDE_DIR)
+  if (DRACO_INCLUDE_PATH AND EXISTS "${DRACO_INCLUDE_PATH}")
+    set (3RDPARTY_DRACO_INCLUDE_DIR "${DRACO_INCLUDE_PATH}" CACHE FILEPATH "The directory containing headers of DRACO" FORCE)
+  endif()
+endif()

-  if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
-    find_path (3RDPARTY_DRACO_INCLUDE_DIR NAMES ${HEADER_NAMES}
-                                                 PATHS ${3RDPARTY_DRACO_DIR}
-                                                 PATH_SUFFIXES "include"
-                                                 CMAKE_FIND_ROOT_PATH_BOTH
-                                                 NO_DEFAULT_PATH)
+if (NOT 3RDPARTY_DRACO_LIBRARY_DIR)
+  if (DRACO_LIBRARY_PATH AND EXISTS "${DRACO_LIBRARY_PATH}")
+    set (3RDPARTY_DRACO_LIBRARY_DIR "${DRACO_LIBRARY_PATH}" CACHE FILEPATH "The directory containing DRACO library" FORCE)
  endif()
 endif()

@@ -62,11 +57,11 @@ endif()

 if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
  if (NOT 3RDPARTY_DRACO_LIBRARY OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
    set (3RDPARTY_DRACO_LIBRARY "3RDPARTY_DRACO_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to Draco library" FORCE)

    find_library (3RDPARTY_DRACO_LIBRARY NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
+                                         PATHS "${3RDPARTY_DRACO_LIBRARY_DIR}"
                                         PATH_SUFFIXES lib
                                         CMAKE_FIND_ROOT_PATH_BOTH
                                         NO_DEFAULT_PATH)
@@ -75,19 +70,27 @@ if (3RDPARTY_DRACO_DIR AND EXISTS "${3RDPARTY_DRACO_DIR}")
      set (3RDPARTY_DRACO_LIBRARY_DIR "${3RDPARTY_DRACO_LIBRARY_DIR}" CACHE FILEPATH "The directory containing Draco library" FORCE)
    endif()
  endif()
+endif()

-  if (WIN32 AND (NOT 3RDPARTY_DRACO_LIBRARY_DEBUG OR NOT EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}"))
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .a)
-    set (3RDPARTY_DRACO_LIBRARY_DEBUG "3RDPARTY_DRACO_LIBRARY_DEBUG-NOTFOUND" CACHE FILEPATH "The path to debug Draco library" FORCE)
+if (3RDPARTY_DRACO_LIBRARY_DIR AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+  list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_DRACO_LIBRARY_DIR}")
+else()
+  list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_DRACO_LIBRARY_DIR)
+endif()

-    find_library (3RDPARTY_DRACO_LIBRARY_DEBUG NAMES ${CSF_Draco}
-                                         PATHS "${3RDPARTY_DRACO_DIR}"
-                                         PATH_SUFFIXES libd
-                                         CMAKE_FIND_ROOT_PATH_BOTH
-                                         NO_DEFAULT_PATH)
-    if (3RDPARTY_DRACO_LIBRARY_DEBUG AND EXISTS "${3RDPARTY_DRACO_LIBRARY_DEBUG}")
-      get_filename_component (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DEBUG}" PATH)
-      set (3RDPARTY_DRACO_LIBRARY_DIR_DEBUG "${3RDPARTY_DRACO_LIBRARY_DIR_DEBUG}" CACHE FILEPATH "The directory containing debug Draco library" FORCE)
-    endif()
+if (INSTALL_DRACO)
+  get_filename_component(3RDPARTY_DRACO_LIBRARY_REALPATH ${3RDPARTY_DRACO_LIBRARY} REALPATH)
+  if (SINGLE_GENERATOR)
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH} DESTINATION "${INSTALL_DIR_LIB}")
+  else()
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS Release
+             DESTINATION "${INSTALL_DIR_LIB}")
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS RelWithDebInfo
+             DESTINATION "${INSTALL_DIR_LIB}i")
+    install (FILES ${3RDPARTY_DRACO_LIBRARY_REALPATH}
+             CONFIGURATIONS Debug
+             DESTINATION "${INSTALL_DIR_LIB}d")
  endif()
 endif()
--- a/adm/cmake/freetype.cmake
+++ b/adm/cmake/freetype.cmake
@@ -110,19 +110,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
    set (ENV{FREETYPE_DIR} "${3RDPARTY_FREETYPE_DIR}")
  endif()

-  unset (FREETYPE_LIBRARY_RELEASE)
  find_package(Freetype)

-  # Only for UNIX (not APPLE)
-  if ((NOT WIN32) AND (NOT APPLE))
-    # To avoid linker error on Ubuntu 18.04 and others linux distributives we should
-    # link with freetype library, compiled as Position Independent Code (PIC),
-    # for example, with shared object.
-    if ((DEFINED FREETYPE_LIBRARY_RELEASE) AND (NOT "${FREETYPE_LIBRARY_RELEASE}" STREQUAL "") AND (EXISTS "${FREETYPE_LIBRARY_RELEASE}"))
-      string (REPLACE "\.a" "\.so" FREETYPE_LIBRARY_RELEASE "${FREETYPE_LIBRARY_RELEASE}")
-    endif()
-  endif()
-
  # restore ENV{FREETYPE_DIR}
  if (3RDPARTY_FREETYPE_DIR AND EXISTS "${3RDPARTY_FREETYPE_DIR}")
    set (ENV{FREETYPE_DIR} ${CACHED_FREETYPE_DIR})
@@ -133,7 +122,7 @@ if (IS_BUILTIN_SEARCH_REQUIRED)
    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_ft2build FILEPATH "The directory containing ft2build.h header")
    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_INCLUDE_DIR_freetype2 FILEPATH "The directory containing ftheader.h header")
    if (BUILD_SHARED_LIBS)
-      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY_RELEASE FILEPATH "freetype library")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_FREETYPE_DIR FREETYPE_LIBRARY FILEPATH "freetype library")
    endif()
  endif()

@@ -152,8 +141,8 @@ if (IS_BUILTIN_SEARCH_REQUIRED)

  if (BUILD_SHARED_LIBS)
    if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-      if (FREETYPE_LIBRARY_RELEASE AND EXISTS "${FREETYPE_LIBRARY_RELEASE}")
-        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY_RELEASE}" CACHE FILEPATH "The path to freetype library" FORCE)
+      if (FREETYPE_LIBRARY AND EXISTS "${FREETYPE_LIBRARY}")
+        set (3RDPARTY_FREETYPE_LIBRARY  "${FREETYPE_LIBRARY}" CACHE FILEPATH "The path to freetype library" FORCE)
      endif()
    endif()

@@ -231,7 +220,7 @@ endif()
 # freetype library
 #if (BUILD_SHARED_LIBS)
  if (NOT 3RDPARTY_FREETYPE_LIBRARY OR NOT EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
-    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib)
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)

    set (FREETYPE_PATH_SUFFIXES lib)
    if (ANDROID)
@@ -253,16 +242,6 @@ endif()
                                              CMAKE_FIND_ROOT_PATH_BOTH)
    endif()

-    # Only for UNIX (not APPLE)
-    if ((NOT WIN32) AND (NOT APPLE))
-      # To avoid linker error on Ubuntu 18.04 and some others linux distributives we should
-      # link with freetype library, compiled as Position Independent Code (PIC),
-      # for example, with shared object.
-      if ((DEFINED 3RDPARTY_FREETYPE_LIBRARY) AND (NOT "${3RDPARTY_FREETYPE_LIBRARY}" STREQUAL "") AND (EXISTS "${3RDPARTY_FREETYPE_LIBRARY}"))
-        string (REPLACE "\.a" "\.so" 3RDPARTY_FREETYPE_LIBRARY "${3RDPARTY_FREETYPE_LIBRARY}")
-      endif()
-    endif()
-
    if (3RDPARTY_FREETYPE_LIBRARY AND EXISTS "${3RDPARTY_FREETYPE_LIBRARY}")
      get_filename_component (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY}" PATH)
      set (3RDPARTY_FREETYPE_LIBRARY_DIR "${3RDPARTY_FREETYPE_LIBRARY_DIR}" CACHE PATH "The directory containing freetype library" FORCE)
@@ -371,7 +350,7 @@ endif()
 # unset all redundant variables
 OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_ft2build)
 OCCT_CHECK_AND_UNSET(FREETYPE_INCLUDE_DIR_freetype2)
-OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY_RELEASE)
+OCCT_CHECK_AND_UNSET(FREETYPE_LIBRARY)

 if (BUILD_SHARED_LIBS)
  mark_as_advanced (3RDPARTY_FREETYPE_LIBRARY 3RDPARTY_FREETYPE_DLL)
--- a/adm/cmake/occt_macros.cmake
+++ b/adm/cmake/occt_macros.cmake
@@ -160,8 +160,6 @@ function (FIND_PRODUCT_DIR ROOT_DIR PRODUCT_NAME RESULT)
  if ("${lower_PRODUCT_NAME}" STREQUAL "egl")
    string (SUBSTRING "${lower_PRODUCT_NAME}" 1 -1 lower_PRODUCT_NAME)
    list (APPEND SEARCH_TEMPLATES "[^gl]+${lower_PRODUCT_NAME}.*")
-  elseif ("${lower_PRODUCT_NAME}" STREQUAL "tbb")
-    list (APPEND SEARCH_TEMPLATES "^.*${lower_PRODUCT_NAME}.*")
  else()
    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*${COMPILER}.*${COMPILER_BITNESS}")
    list (APPEND SEARCH_TEMPLATES "^[^a-zA-Z]*${lower_PRODUCT_NAME}[^a-zA-Z]*[0-9.]+.*${COMPILER}.*${COMPILER_BITNESS}")
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -70,16 +70,6 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
    OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]lex" SOURCE_FILES_FLEX)
    list (LENGTH SOURCE_FILES_FLEX SOURCE_FILES_FLEX_LEN)

-    # remove old general version of FlexLexer
-    if (EXISTS ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
-      message (STATUS "Info: remove old FLEX header file: ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h")
-      file(REMOVE ${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h)
-    endif()
-    # install copy of FlexLexer.h locally to allow further building without flex
-    if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
-      configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${CMAKE_SOURCE_DIR}/${RELATIVE_SOURCES_DIR}/FlexLexer/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
-    endif()
-
    # bison files
    OCCT_ORIGIN_AND_PATCHED_FILES ("${RELATIVE_SOURCES_DIR}/${OCCT_PACKAGE}" "*[.]yacc" SOURCE_FILES_BISON)
    list (LENGTH SOURCE_FILES_BISON SOURCE_FILES_BISON_LEN)
@@ -117,11 +107,21 @@ foreach (OCCT_PACKAGE ${USED_PACKAGES})
            endif()
          endforeach()

+          if (EXISTS ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
+            message (STATUS "Info: remove old FLEX header file: ${FLEX_BISON_TARGET_DIR}/FlexLexer.h")
+            file(REMOVE ${FLEX_BISON_TARGET_DIR}/FlexLexer.h)
+          endif()
+
          file (STRINGS "${CURRENT_FLEX_FILE}" FILE_FLEX_CONTENT)
          foreach (FILE_FLEX_CONTENT_LINE ${FILE_FLEX_CONTENT})
            string (REGEX MATCH "%option c\\+\\+" CXX_FLEX_LANGUAGE_FOUND ${FILE_FLEX_CONTENT_LINE})
            if (CXX_FLEX_LANGUAGE_FOUND)
              set (FLEX_OUTPUT_FILE_EXT "cxx")
+
+              # install copy of FlexLexer.h locally to allow further building without flex
+              if (FLEX_INCLUDE_DIR AND EXISTS "${FLEX_INCLUDE_DIR}/FlexLexer.h")
+                configure_file("${FLEX_INCLUDE_DIR}/FlexLexer.h" "${FLEX_BISON_TARGET_DIR}/FlexLexer.h" @ONLY NEWLINE_STYLE LF)
+              endif()
            endif()
          endforeach()
          set (BISON_OUTPUT_FILE ${CURRENT_BISON_FILE_NAME}.tab.${BISON_OUTPUT_FILE_EXT})
@@ -245,18 +245,6 @@ endif (USE_QT)
 if (EXECUTABLE_PROJECT)
  add_executable (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})

-  if (DEFINED ${PROJECT_NAME}_DISABLE_COTIRE AND ${PROJECT_NAME}_DISABLE_COTIRE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  else()
-    # To avoid excluding of PROJECT_NAME from cotire tool, we may use cotire
-    # COTIRE_PREFIX_HEADER_IGNORE_PATH instead. But, practically it causes many 'undefined symbols' error.
-    # So, we just exclude PROJECT_NAME from cotire list.
-    # if (DEFINED ${PROJECT_NAME}_COTIRE_IGNORE_PATH)
-    #   set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH "${${PROJECT_NAME}_COTIRE_IGNORE_PATH}")
-    # endif()
-  endif()
-
  install (TARGETS ${PROJECT_NAME}
           DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")

@@ -266,33 +254,15 @@ if (EXECUTABLE_PROJECT)
 else()
  add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})

-  if (DEFINED ${PROJECT_NAME}_DISABLE_COTIRE AND ${PROJECT_NAME}_DISABLE_COTIRE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
-  else()
-    # To avoid excluding of PROJECT_NAME from cotire tool, we may use cotire
-    # COTIRE_PREFIX_HEADER_IGNORE_PATH instead. But, practically it causes many 'undefined symbols' error.
-    # So, we just exclude PROJECT_NAME from cotire list.
-    # if (DEFINED ${PROJECT_NAME}_COTIRE_IGNORE_PATH)
-    #   set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_PREFIX_HEADER_IGNORE_PATH "${${PROJECT_NAME}_COTIRE_IGNORE_PATH}")
-    # endif()
-  endif()
-
  if (MSVC)
    if (BUILD_FORCE_RelWithDebInfo)
      set (aReleasePdbConf "Release")
    else()
      set (aReleasePdbConf)
    endif()
-    if (BUILD_SHARED_LIBS)
-      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
+    install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
             CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
             DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
-    else()
-      install (FILES  ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/lib\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
-             CONFIGURATIONS Debug ${aReleasePdbConf} RelWithDebInfo
-             DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}")
-    endif()
  endif()

  if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
@@ -376,10 +346,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
            add_definitions (-DHAVE_GLES2)
          endif()

-          if ("${CURRENT_CSF}" STREQUAL "${CSF_Draco}")
-            set (CURRENT_CSF "")
-            set (USED_DRACO 1)
-          endif()
          set (LIBRARY_FROM_CACHE 0)
          separate_arguments (CURRENT_CSF)
          foreach (CSF_LIBRARY ${CURRENT_CSF})
@@ -407,7 +373,7 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
            endforeach()
          endforeach()

-          if (NOT ${LIBRARY_FROM_CACHE} AND NOT "${CURRENT_CSF}" STREQUAL "")
+          if (NOT ${LIBRARY_FROM_CACHE})
            # prepare a list from a string with whitespaces
            separate_arguments (CURRENT_CSF)
            list (APPEND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT ${CURRENT_CSF})
@@ -418,28 +384,6 @@ foreach (USED_ITEM ${USED_EXTERNLIB_AND_TOOLKITS})
  endif()
 endforeach()

-if (USE_DRACO)
-  if (USED_DRACO)
-    set (USED_LIB_RELEASE ${3RDPARTY_DRACO_LIBRARY})
-    if (WIN32)
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY_DEBUG})
-    else()
-      set (USED_LIB_DEBUG ${3RDPARTY_DRACO_LIBRARY})
-    endif()
-    set (USED_LIB_CONF)
-    if (EXISTS ${USED_LIB_DEBUG})
-      set (USED_LIB_CONF "$<$<CONFIG:DEBUG>:${USED_LIB_DEBUG}>;${USED_LIB_CONF}")
-    endif()
-    if (EXISTS ${USED_LIB_RELEASE})
-      set (USED_LIB_CONF "$<$<CONFIG:RELEASE>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-      set (USED_LIB_CONF "$<$<CONFIG:RELWITHDEBINFO>:${USED_LIB_RELEASE}>;${USED_LIB_CONF}")
-    endif()
-    if (DEFINED USED_LIB_CONF)
-      set_property (TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_LIBRARIES "${USED_LIB_CONF}")
-    endif()
-  endif()
-endif()
-
 if (APPLE)
  list (FIND USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT X11 IS_X11_FOUND)
  if (NOT ${IS_X11_FOUND} EQUAL -1)
--- a/adm/cmake/tbb.cmake
+++ b/adm/cmake/tbb.cmake
@@ -1,240 +1,294 @@
 # tbb

+if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
+  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
+endif()
+
+# tbb directory
+if (NOT DEFINED 3RDPARTY_TBB_DIR)
+  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
+endif()
+
 if (MSVC AND BUILD_SHARED_LIBS)
  add_definitions (-D__TBB_NO_IMPLICIT_LINKAGE)
  add_definitions (-D__TBBMALLOC_NO_IMPLICIT_LINKAGE)
 endif()

-if (NOT DEFINED INSTALL_TBB AND BUILD_SHARED_LIBS)
-  set (INSTALL_TBB OFF CACHE BOOL "${INSTALL_TBB_DESCR}")
-endif()
+# include occt macros. compiler_bitness, os_wiht_bit, compiler
+OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_macros")

-# Initialize tbb directory.
-if (NOT DEFINED 3RDPARTY_TBB_DIR)
-  set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing tbb")
-endif()
+# specify TBB folder in connectin with 3RDPARTY_DIR
+if (3RDPARTY_DIR AND EXISTS "${3RDPARTY_DIR}")
+  #CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_DIR 3RDPARTY_TBB_DIR PATH "The directory containing tbb")

-if (WIN32)
-  if (NOT DEFINED 3RDPARTY_DIR)
-    message (FATAL_ERROR "3RDPARTY_DIR is not defined.")
-  endif()
-  if ("${3RDPARTY_DIR}" STREQUAL "")
-    message (FATAL_ERROR "3RDPARTY_DIR is empty string.")
-  endif()
-  if (NOT EXISTS "${3RDPARTY_DIR}")
-    message (FATAL_ERROR "3RDPARTY_DIR is not exist.")
-  endif()
-
-  # Below, we have correct 3RDPARTY_DIR.
-
-  # Initialize TBB folder in connectin with 3RDPARTY_DIR.
-  if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
+  if (NOT 3RDPARTY_TBB_DIR OR NOT EXISTS "${3RDPARTY_TBB_DIR}")
    FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
    if (TBB_DIR_NAME)
      set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
    endif()
  endif()
+else()
+  #set (3RDPARTY_TBB_DIR "" CACHE PATH "The directory containing TBB" FORCE)
+endif()

-  # Here we have full path name to installation directory of TBB.
-  # Employ it.
-  if (EXISTS "${3RDPARTY_TBB_DIR}")
-    find_package (
-      TBB 2021.5
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-      REQUIRED
-      CONFIG)
+if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+endif()

-    # Achive include directory
-    get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-    if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-      set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
+if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+    # check 3RDPARTY_TBB_INCLUDE_DIR for consictency with specified 3RDPARTY_TBB_DIR
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_TBB_INCLUDE_DIR PATH "The directory containing headers of the TBB")
+endif()
+
+# tbb.h
+if (NOT 3RDPARTY_TBB_INCLUDE_DIR OR NOT EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+
+  set (HEADER_NAMES tbb.h tbb/tbb.h)
+
+  # set 3RDPARTY_TBB_INCLUDE_DIR as notfound, otherwise find_library can't assign a new value to 3RDPARTY_TBB_INCLUDE_DIR
+  set (3RDPARTY_TBB_INCLUDE_DIR "3RDPARTY_TBB_INCLUDE_DIR-NOTFOUND" CACHE PATH "the path to tbb.h" FORCE)
+
+  if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+    find_path (3RDPARTY_TBB_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATHS ${3RDPARTY_TBB_DIR}
+                                              PATH_SUFFIXES include
+                                              CMAKE_FIND_ROOT_PATH_BOTH
+                                              NO_DEFAULT_PATH)
+  else()
+    find_path (3RDPARTY_TBB_INCLUDE_DIR NAMES ${HEADER_NAMES}
+                                              PATH_SUFFIXES include
+                                              CMAKE_FIND_ROOT_PATH_BOTH)
+  endif()
+endif()
+
+if (3RDPARTY_TBB_INCLUDE_DIR AND EXISTS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+else()
+  list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+
+  set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "the path to tbb.h" FORCE)
+endif()
+
+# common steps for tbb and tbbmalloc
+macro (TBB_PRODUCT_SEARCH PRODUCT_LIBRARY_NAME)
+
+  string (TOUPPER ${PRODUCT_LIBRARY_NAME} upper_PRODUCT_LIBRARY_NAME)
+
+  # define required tbb/tbbmalloc variables
+  if (NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY OR NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+  endif()
+
+  if (NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library")
+  endif()
+
+  if (WIN32)
+    if (NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL OR NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL "" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
    endif()
-    if (EXISTS "${TBB_INCLUDE_DIR}")
-      set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-      list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
+  endif()
+
+  if (WIN32 AND NOT DEFINED 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library")
+  endif()
+
+  # check 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_ paths for consistency with specified 3RDPARTY_TBB_DIR
+  if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+    CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY FILEPATH "the path to ${upper_PRODUCT_LIBRARY_NAME} library")
+
+    if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}")
+      get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}" PATH)
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
    else()
-      list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library")
    endif()

-    separate_arguments (CSF_TBB)
-    foreach (LIB IN LISTS CSF_TBB)
-      string(TOLOWER "${LIB}" LIB_LOWER)
-      string(TOUPPER "${LIB}" LIB_UPPER)
+    if (WIN32)
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL FILEPATH "the path to ${upper_PRODUCT_LIBRARY_NAME} shared library")

-      # Achive *.lib files and directory containing it.
-      get_target_property (TBB_LIB_FILE "TBB::${LIB_LOWER}" IMPORTED_IMPLIB_RELEASE)
-      # Reserve cache variable for *.lib.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.lib)")
-      endif()
-      # Reserve cache variable for directory containing *.lib file.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.lib)")
-      endif()
-      if (EXISTS "${TBB_LIB_FILE}")
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY
-             "${TBB_LIB_FILE}"
-             CACHE FILEPATH
-             "${LIB_UPPER} library (*.lib)"
-             FORCE)
-        get_filename_component (TBB_LIB_FILE_DIRECTORY "${TBB_LIB_FILE}" DIRECTORY)
-        set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-             "${TBB_LIB_FILE_DIRECTORY}"
-             CACHE PATH
-             "The directory containing ${LIB_UPPER} library (*.lib)"
-             FORCE)
-        list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
+      if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}")
+        get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}" PATH)
+        set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
      else()
-        list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-      endif()

-      # Achive *.dll files and directory containing it.
-      get_target_property (TBB_DLL_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-      # Reserve cache variable for *.dll.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL)
-        set (3RDPARTY_${LIB_UPPER}_DLL "" CACHE FILEPATH "${LIB_UPPER} library (*.dll)")
+      CHECK_PATH_FOR_CONSISTENCY (3RDPARTY_TBB_DIR 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library")
      endif()
-      # Reserve cache variable for directory containing *.dll file.
-      if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_DLL_DIR)
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.dll)")
-      endif()
-      if (EXISTS "${TBB_DLL_FILE}")
-        set (3RDPARTY_${LIB_UPPER}_DLL
-             "${TBB_DLL_FILE}"
-             CACHE FILEPATH
-             "${LIB_UPPER} library (*.dll)"
-             FORCE)
-        get_filename_component (TBB_DLL_FILE_DIRECTORY "${TBB_DLL_FILE}" DIRECTORY)
-        set (3RDPARTY_${LIB_UPPER}_DLL_DIR
-             "${TBB_DLL_FILE_DIRECTORY}"
-             CACHE PATH
-             "The directory containing ${LIB_UPPER} library (*.dll)"
-             FORCE)
-        list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${LIB_UPPER}_DLL_DIR}")
+    endif()
+  endif()
+
+  OCCT_MAKE_COMPILER_SHORT_NAME()
+  OCCT_MAKE_COMPILER_BITNESS()
+
+  if (${COMPILER_BITNESS} EQUAL 32)
+    set (${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME ia32)
+  else()
+    set (${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME intel64)
+  endif()
+
+  # tbb/tbbmalloc library
+  if (NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}")
+    
+    set (CMAKE_FIND_LIBRARY_SUFFIXES .lib .so .dylib .a)
+    set (PRODUCT_PATH_SUFFIXES lib ${PRODUCT_LIBRARY_NAME})
+
+    # set 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY-NOTFOUND" CACHE FILEPATH "The path to ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+
+    if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+      if (NOT EXISTS "${3RDPARTY_TBB_DIR}/lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER}")
+        if (EXISTS "${3RDPARTY_TBB_DIR}/lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}")
+          file (GLOB ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST "${3RDPARTY_TBB_DIR}/lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/*")
+          if (${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST)
+            list (GET ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST -1 THE_MOST_FRESH_COMPILER_VERSION)
+            if (THE_MOST_FRESH_COMPILER_VERSION)
+              get_filename_component (THE_MOST_FRESH_COMPILER_VERSION_NAME "${THE_MOST_FRESH_COMPILER_VERSION}" NAME)
+              set (PRODUCT_PATH_SUFFIXES lib ${PRODUCT_LIBRARY_NAME} lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${THE_MOST_FRESH_COMPILER_VERSION_NAME})
+            endif()
+          endif()
+        endif()
      else()
-        list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${LIB_UPPER}_DLL_DIR)
+        set (PRODUCT_PATH_SUFFIXES lib ${PRODUCT_LIBRARY_NAME} lib/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER})
      endif()

-      # install *.dll (tbb & tbbmalloc)
-      if (INSTALL_TBB)
-        OCCT_MAKE_OS_WITH_BITNESS()
-        OCCT_MAKE_COMPILER_SHORT_NAME()
+      find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY ${PRODUCT_LIBRARY_NAME}
+                                         PATHS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}" "${3RDPARTY_TBB_DIR}"
+                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
+                                         CMAKE_FIND_ROOT_PATH_BOTH
+                                         NO_DEFAULT_PATH)
+    else()
+      find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY ${PRODUCT_LIBRARY_NAME}
+                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
+                                         CMAKE_FIND_ROOT_PATH_BOTH)
+    endif()

-        if (SINGLE_GENERATOR)
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
+    if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}")
+      get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}" PATH)
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+    else()
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+    endif()
+  endif()
+
+  if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
+    list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR}")
+  else()
+    list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY_DIR)
+
+    set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY "" CACHE FILEPATH "The path to ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+  endif()
+
+  # tbb/tbbmalloc shared library
+  if (WIN32)
+    if (NOT 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL OR NOT EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}")
+      set (CMAKE_FIND_LIBRARY_SUFFIXES .dll)
+      set (PRODUCT_PATH_SUFFIXES bin)
+
+      # set 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL as notfound, otherwise find_library can't assign a new value to 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL
+      set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL "3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL-NOTFOUND" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
+
+      if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+        if (NOT EXISTS "${3RDPARTY_TBB_DIR}/bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER}")
+          if (EXISTS "${3RDPARTY_TBB_DIR}/bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}")
+            file (GLOB ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST "${3RDPARTY_TBB_DIR}/bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/*")
+            if (${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST)
+              list (GET ${upper_PRODUCT_LIBRARY_NAME}_COMPILER_LIST -1 THE_MOST_FRESH_COMPILER_VERSION)
+              if (THE_MOST_FRESH_COMPILER_VERSION)
+                get_filename_component (THE_MOST_FRESH_COMPILER_VERSION_NAME "${THE_MOST_FRESH_COMPILER_VERSION}" NAME)
+                set (PRODUCT_PATH_SUFFIXES bin bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${THE_MOST_FRESH_COMPILER_VERSION_NAME})
+              endif()
+            endif()
+          endif()
        else()
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_BIN}")
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_BIN}i")
-          install (FILES ${3RDPARTY_${LIB_UPPER}_DLL} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_BIN}d")
+          set (PRODUCT_PATH_SUFFIXES bin bin/${${upper_PRODUCT_LIBRARY_NAME}_ARCH_NAME}/${COMPILER})
+        endif()
+
+        if (3RDPARTY_TBB_DIR AND EXISTS "${3RDPARTY_TBB_DIR}")
+          find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL ${PRODUCT_LIBRARY_NAME}
+                                         PATHS "${3RDPARTY_TBB_DIR}"
+                                         PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES}
+                                         NO_DEFAULT_PATH)
+        else()
+          find_library (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL ${PRODUCT_LIBRARY_NAME} PATH_SUFFIXES ${PRODUCT_PATH_SUFFIXES})
+        endif()
+
+        if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL AND EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}")
+          get_filename_component (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}" PATH)
+          set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} library" FORCE)
+        else()
+          set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR "" CACHE PATH "The directory containing ${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
+
+          set (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL "" CACHE FILEPATH "${upper_PRODUCT_LIBRARY_NAME} shared library" FORCE)
        endif()
      endif()
-      mark_as_advanced (3RDPARTY_${LIB_UPPER}_LIBRARY 3RDPARTY_${LIB_UPPER}_DLL)
-    endforeach()
-    if (INSTALL_TBB)
-      set (USED_3RDPARTY_TBB_DIR "")
-    else()
-      # the *.dll/*.so* directory for using by the executable
-      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
    endif()
-  else()
-    message (FATAL_ERROR "Installation directory with TBB is not exist.")
+
+    if (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR OR EXISTS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
+      list (APPEND 3RDPARTY_DLL_DIRS "${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR}")
+    else()
+      list (APPEND 3RDPARTY_NO_DLLS 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL_DIR)
+    endif()
  endif()
-else ()
-  # NOT WIN32 branch
-  if ((DEFINED 3RDPARTY_DIR) AND (NOT "${3RDPARTY_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_DIR}"))
-    # Here, we have correct 3RDPARTY_DIR.
-    # Trying to specify TBB folder in connection with 3RDPARTY_DIR
-    if (("${3RDPARTY_TBB_DIR}" STREQUAL "") OR (NOT EXISTS "${3RDPARTY_TBB_DIR}"))
-      FIND_PRODUCT_DIR ("${3RDPARTY_DIR}" TBB TBB_DIR_NAME)
-      if (TBB_DIR_NAME)
-        set (3RDPARTY_TBB_DIR "${3RDPARTY_DIR}/${TBB_DIR_NAME}" CACHE PATH "The directory containing tbb" FORCE)
+
+  # install tbb/tbbmalloc
+  if (INSTALL_TBB)
+    OCCT_MAKE_OS_WITH_BITNESS()
+    OCCT_MAKE_COMPILER_SHORT_NAME()
+
+    if (WIN32)
+      if (SINGLE_GENERATOR)
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL} DESTINATION "${INSTALL_DIR_BIN}")
+      else()
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR_BIN}")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR_BIN}i")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL}
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR_BIN}d")
      endif()
-    endif()
-    if ((NOT "${3RDPARTY_TBB_DIR}" STREQUAL "") AND (EXISTS "${3RDPARTY_TBB_DIR}"))
-      # Find TBB 2021.5 in existing directory.
-      find_package (
-      TBB 2021.5
-      PATHS "${3RDPARTY_TBB_DIR}" NO_DEFAULT_PATH
-      REQUIRED
-      CONFIG)
    else()
-      # Find TBB 2021.5 in system directory.
-      find_package (
-      TBB 2021.5
-      REQUIRED
-      CONFIG)
-    endif()
-  else()
-    # Find TBB 2021.5 in system directory.
-    find_package (
-    TBB 2021.5
-    REQUIRED
-    CONFIG)
-  endif()
-  # TBB has been configured (in other case FATAL_ERROR occures).
-
-  # Achive include directory.
-  get_target_property (TBB_INCLUDE_DIR TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-  if (NOT DEFINED 3RDPARTY_TBB_INCLUDE_DIR)
-    set (3RDPARTY_TBB_INCLUDE_DIR "" CACHE PATH "The directory containing headers of the TBB")
-  endif()
-  if (EXISTS "${TBB_INCLUDE_DIR}")
-    set (3RDPARTY_TBB_INCLUDE_DIR "${TBB_INCLUDE_DIR}" CACHE PATH "The directory containing headers of the TBB" FORCE)
-    list (APPEND 3RDPARTY_INCLUDE_DIRS "${3RDPARTY_TBB_INCLUDE_DIR}")
-  else()
-    list (APPEND 3RDPARTY_NOT_INCLUDED 3RDPARTY_TBB_INCLUDE_DIR)
-  endif()
-
-  separate_arguments (CSF_TBB)
-  foreach (LIB IN LISTS CSF_TBB)
-    string(TOLOWER "${LIB}" LIB_LOWER)
-    string(TOUPPER "${LIB}" LIB_UPPER)
-
-    # Achive *.so files and directory containing it.
-    get_target_property (TBB_SO_FILE "TBB::${LIB_LOWER}" IMPORTED_LOCATION_RELEASE)
-    # Reserve cache variable for *.so.
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY "" CACHE FILEPATH "${LIB_UPPER} library (*.so)")
-    endif()
-    # Reserve cache variable for directory containing *.so file.
-    if (NOT DEFINED 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR "" CACHE PATH "The directory containing ${LIB_UPPER} library (*.so)")
-    endif()
-    if (EXISTS "${TBB_SO_FILE}")
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY
-           "${TBB_SO_FILE}"
-           CACHE FILEPATH
-           "${LIB_UPPER} library (*.so)"
-           FORCE)
-      get_filename_component (TBB_SO_FILE_DIRECTORY "${TBB_SO_FILE}" DIRECTORY)
-      set (3RDPARTY_${LIB_UPPER}_LIBRARY_DIR
-           "${TBB_SO_FILE_DIRECTORY}"
-           CACHE PATH
-           "The directory containing ${LIB_UPPER} library (*.so)"
-           FORCE)
-      list (APPEND 3RDPARTY_LIBRARY_DIRS "${3RDPARTY_${LIB_UPPER}_LIBRARY_DIR}")
-    else()
-      list (APPEND 3RDPARTY_NO_LIBS 3RDPARTY_${LIB_UPPER}_LIBRARY_DIR)
-    endif()
-
-    # install *.so* (tbb & tbbmalloc)
-    if (INSTALL_TBB)
-      OCCT_MAKE_OS_WITH_BITNESS()
-      OCCT_MAKE_COMPILER_SHORT_NAME()
+      get_filename_component (PRODUCT_LIBRARY_NAME ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY} NAME)

      if (SINGLE_GENERATOR)
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} DESTINATION "${INSTALL_DIR_LIB}")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 DESTINATION "${INSTALL_DIR_LIB}"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
      else()
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Release DESTINATION "${INSTALL_DIR_LIB}")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS RelWithDebInfo DESTINATION "${INSTALL_DIR_LIB}i")
-        install (FILES ${3RDPARTY_${LIB_UPPER}_LIBRARY} CONFIGURATIONS Debug DESTINATION "${INSTALL_DIR_LIB}d")
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 CONFIGURATIONS Release
+                 DESTINATION "${INSTALL_DIR_LIB}"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 CONFIGURATIONS RelWithDebInfo
+                 DESTINATION "${INSTALL_DIR_LIB}i"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
+        install (FILES ${3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY}.2
+                 CONFIGURATIONS Debug
+                 DESTINATION "${INSTALL_DIR_LIB}d"
+                 RENAME ${PRODUCT_LIBRARY_NAME}.2)
      endif()
    endif()
+  endif()
+  mark_as_advanced (3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_LIBRARY 3RDPARTY_${upper_PRODUCT_LIBRARY_NAME}_DLL)
+endmacro()
+
+#if (BUILD_SHARED_LIBS)
+  separate_arguments (CSF_TBB)
+  foreach (LIB IN LISTS CSF_TBB)
+    TBB_PRODUCT_SEARCH (${LIB})
  endforeach()
+
  if (INSTALL_TBB)
    set (USED_3RDPARTY_TBB_DIR "")
  else()
-    # the *.so* directory for using by the executable
-    set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
+    # the library directory for using by the executable
+    if (WIN32)
+      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_DLL_DIR})
+    else()
+      set (USED_3RDPARTY_TBB_DIR ${3RDPARTY_TBB_LIBRARY_DIR})
+    endif()
  endif()
-endif()
+#endif()
--- a/adm/cmake/vardescr.cmake
+++ b/adm/cmake/vardescr.cmake
@@ -116,7 +116,6 @@ endmacro()

 BUILD_MODULE_MESSAGE (BUILD_MODULE_ApplicationFramework "ApplicationFramework")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_DataExchange         "DataExchange")
-BUILD_MODULE_MESSAGE (BUILD_MODULE_DETools              "DETools")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_Draw                 "Draw")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_FoundationClasses    "FoundationClasses")
 BUILD_MODULE_MESSAGE (BUILD_MODULE_ModelingAlgorithms   "ModelingAlgorithms")
--- a/adm/genconfdeps.tcl
+++ b/adm/genconfdeps.tcl
@@ -780,14 +780,14 @@ proc wokdep:SearchTBB {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin64
      }
    }
    if { "$::tcl_platform(platform)" == "windows" } {
-      set aTbbDllPath [wokdep:SearchBin "tbb12.dll" "$anArchIter"]
+      set aTbbDllPath [wokdep:SearchBin "tbb.dll" "$anArchIter"]
      if { "$aTbbDllPath" == "" } {
        set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tbb}*] $aVcLib "$anArchIter" ]
-        set aTbbDllPath [wokdep:SearchBin "tbb12.dll" "$anArchIter" "$aPath/bin/$aSubDir/$aVcLib"]
+        set aTbbDllPath [wokdep:SearchBin "tbb.dll" "$anArchIter" "$aPath/bin/$aSubDir/$aVcLib"]
        if { "$aTbbDllPath" != "" } {
          lappend ::CSF_OPT_BIN$anArchIter "$aPath/bin/$aSubDir/$aVcLib"
        } else {
-          lappend anErrBin$anArchIter "Error: 'tbb12.dll' not found (Intel TBB)"
+          lappend anErrBin$anArchIter "Error: 'tbb.dll' not found (Intel TBB)"
          if { "$::ARCH" == "$anArchIter"} { set isFound "false" }
        }
      }
--- a/adm/genproj.tcl
+++ b/adm/genproj.tcl
@@ -1233,11 +1233,28 @@ proc osutils:convertModules { theModules theSrcDir theSourceDirOther theProjects
      lappend aProjectsInModule($aModule) $aToolKit
      lappend aDependencies [LibToLink $aToolKit $theSrcDir $theSourceDirOther]
    }
-    # executables
+    # executables, assume one project per cxx file...
    foreach aUnit [OS:executable ${aModule}] {
-      lappend aProjects $aUnit
-      lappend aProjectsInModule($aModule) $aUnit
-      lappend aDependencies [LibToLink $aUnit $theSrcDir $theSourceDirOther]
+      set aUnitLoc $aUnit
+      set src_files [_get_used_files $aUnit $theSrcDir false]
+      set aSrcFiles {}
+      foreach s $src_files {
+        regexp {source ([^\s]+)} $s dummy name
+        lappend aSrcFiles $name
+      }
+      foreach aSrcFile $aSrcFiles {
+        set aFileExtension [file extension $aSrcFile]
+        if { $aFileExtension == ".cxx" } {
+          set aPrjName [file rootname $aSrcFile]
+          lappend aProjects $aPrjName
+          lappend aProjectsInModule($aModule) $aPrjName
+          if {[file isdirectory $path/$theSrcDir/$aUnitLoc]} {
+            lappend aDependencies [LibToLinkX $aUnitLoc [file rootname $aSrcFile] $theSrcDir $theSourceDirOther]
+          } else {
+            lappend aDependencies {}
+          }
+        }
+      }
    }
  }
 }
@@ -2093,106 +2110,98 @@ proc osutils:tk:execfiles { theFiles theOutDir theCommand thePrefix theExtension
 # Generate Visual Studio project file for executable
 proc osutils:vcprojx { theVcVer isUWP theOutDir theToolKit theGuidsMap theSrcDir theSourceDirOther } {
  set aVcFiles {}
-  set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1]
+  foreach f [osutils:tk:cxxfiles $theToolKit wnt $theSrcDir] {
+    set aProjTmpl [osutils:vcproj:readtemplate $theVcVer $isUWP 1]

-  set aProjName $theToolKit
-  set l_compilable [osutils:compilable wnt]
-  regsub -all -- {__XQTNAM__} $aProjTmpl $aProjName aProjTmpl
+    set aProjName [file rootname [file tail $f]]
+    set l_compilable [osutils:compilable wnt]
+    regsub -all -- {__XQTNAM__} $aProjTmpl $aProjName aProjTmpl

-  upvar $theGuidsMap aGuidsMap
-  if { ! [info exists aGuidsMap($aProjName)] } {
-    set aGuidsMap($aProjName) [OS:genGUID]
-  }
-  regsub -all -- {__PROJECT_GUID__} $aProjTmpl $aGuidsMap($aProjName) aProjTmpl
+    upvar $theGuidsMap aGuidsMap
+    if { ! [info exists aGuidsMap($aProjName)] } {
+      set aGuidsMap($aProjName) [OS:genGUID]
+    }
+    regsub -all -- {__PROJECT_GUID__} $aProjTmpl $aGuidsMap($aProjName) aProjTmpl

-  set aUsedLibs [list]
-  foreach tkx [osutils:commonUsedTK  $theToolKit $theSrcDir $theSourceDirOther] {
-    lappend aUsedLibs "${tkx}.lib"
-  }
+    set aUsedLibs [list]
+    foreach tkx [osutils:commonUsedTK  $theToolKit $theSrcDir $theSourceDirOther] {
+      lappend aUsedLibs "${tkx}.lib"
+    }

-  set anOsReleaseLibs {}
-  set anOsDebugLibs {}
-  osutils:usedOsLibs $theToolKit "wnt" anOsReleaseLibs aFrameworks $theSrcDir true
-  osutils:usedOsLibs $theToolKit "wnt" anOsDebugLibs   aFrameworks $theSrcDir false
+    set anOsReleaseLibs {}
+    set anOsDebugLibs {}
+    osutils:usedOsLibs $theToolKit "wnt" anOsReleaseLibs aFrameworks $theSrcDir true
+    osutils:usedOsLibs $theToolKit "wnt" anOsDebugLibs aFrameworks $theSrcDir false

-  set aVCRTVer [string range $theVcVer 0 3]
-  regsub -all -- {__TKDEP__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] aProjTmpl
-  regsub -all -- {__TKDEP_DEBUG__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] aProjTmpl
-  regsub -all -- {__TKDEFINES__} $aProjTmpl "" aProjTmpl
+    set aVCRTVer [string range $theVcVer 0 3]
+    regsub -all -- {__TKDEP__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsReleaseLibs $theVcVer] aProjTmpl
+    regsub -all -- {__TKDEP_DEBUG__} $aProjTmpl [osutils:depLibraries $aUsedLibs $anOsDebugLibs $theVcVer] aProjTmpl
+    regsub -all -- {__TKDEFINES__} $aProjTmpl "" aProjTmpl

-  set aFilesSection ""
-  set aVcFilesCxx(units) ""
-  set aVcFilesHxx(units) ""
+    set aFilesSection ""
+    set aVcFilesCxx(units) ""
+	set aVcFilesHxx(units) ""

-  if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-    foreach f [osutils:tk:cxxfiles $theToolKit wnt $theSrcDir] {
-      if { ![info exists written([file tail $f])] } {
-        set written([file tail $f]) 1
+    if { ![info exists written([file tail $f])] } {
+      set written([file tail $f]) 1
+
+      if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
        append aFilesSection [osutils:vcxproj:cxxfile $f "" 3]
        if { ! [info exists aVcFilesCxx($theToolKit)] } { lappend aVcFilesCxx(units) $theToolKit }
        lappend aVcFilesCxx($theToolKit) $f
      } else {
-        puts "Warning : in vcproj there are more than one occurrences for [file tail $f]"
-      }
-    }
-  } else {
-    append aFilesSection "\t\t\t<Filter\n"
-    append aFilesSection "\t\t\t\tName=\"$theToolKit\"\n"
-    append aFilesSection "\t\t\t\t>\n"
-    foreach f [osutils:tk:cxxfiles $theToolKit wnt $theSrcDir] {
-      if { ![info exists written([file tail $f])] } {
-        set written([file tail $f]) 1
+        append aFilesSection "\t\t\t<Filter\n"
+        append aFilesSection "\t\t\t\tName=\"$theToolKit\"\n"
+        append aFilesSection "\t\t\t\t>\n"
        append aFilesSection [osutils:vcproj:file $theVcVer $f ""]
-      } else {
-        puts "Warning : in vcproj there are more than one occurrences for [file tail $f]"
+        append aFilesSection "\t\t\t</Filter>"
      }
+    } else {
+      puts "Warning : in vcproj there are more than one occurrences for [file tail $f]"
    }
-    append aFilesSection "\t\t\t</Filter>"
-  }
+    #puts "$aProjTmpl $aFilesSection"
+    set anIncPaths "..\\..\\..\\inc"
+    regsub -all -- {__TKINC__}  $aProjTmpl $anIncPaths    aProjTmpl
+    regsub -all -- {__FILES__}  $aProjTmpl $aFilesSection aProjTmpl
+    regsub -all -- {__CONF__}   $aProjTmpl Application    aProjTmpl

-  #puts "$aProjTmpl $aFilesSection"
-  set anIncPaths "..\\..\\..\\inc"
-  regsub -all -- {__TKINC__}  $aProjTmpl $anIncPaths    aProjTmpl
-  regsub -all -- {__FILES__}  $aProjTmpl $aFilesSection aProjTmpl
-  regsub -all -- {__CONF__}   $aProjTmpl Application    aProjTmpl
+    regsub -all -- {__XQTEXT__} $aProjTmpl "exe" aProjTmpl

-  regsub -all -- {__XQTEXT__} $aProjTmpl "exe" aProjTmpl
-
-  set aFile [open [set aVcFilePath [file join $theOutDir ${aProjName}.[osutils:vcproj:ext $theVcVer]]] w]
-  fconfigure $aFile -translation crlf
-  puts $aFile $aProjTmpl
-  close $aFile
-
-  set aCommonSettingsFile "$aVcFilePath.user"
-  lappend aVcFiles $aVcFilePath
-
-  # write filters file for vc10
-  if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
-    lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesCxx aVcFilesHxx]
-  }
-
-  # write resource file
-  lappend aVcFiles [osutils:readtemplate:rc $theOutDir $aProjName]
-
-  set aCommonSettingsFileTmpl ""
-  if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
-    # nothing
-  } elseif { "$theVcVer" == "vc9" } {
-    set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcproj.user.vc9x"]
-  } else {
-    set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcxproj.user.vc10x"]
-  }
-  if { "$aCommonSettingsFileTmpl" != "" } {
-    regsub -all -- {__VCVER__} $aCommonSettingsFileTmpl $aVCRTVer aCommonSettingsFileTmpl
-
-    set aFile [open [set aVcFilePath "$aCommonSettingsFile"] w]
+    set aFile [open [set aVcFilePath [file join $theOutDir ${aProjName}.[osutils:vcproj:ext $theVcVer]]] w]
    fconfigure $aFile -translation crlf
-    puts $aFile $aCommonSettingsFileTmpl
+    puts $aFile $aProjTmpl
    close $aFile

-    lappend aVcFiles "$aCommonSettingsFile"
-  }
+    set aCommonSettingsFile "$aVcFilePath.user"
+    lappend aVcFiles $aVcFilePath

+    # write filters file for vc10
+    if { "$theVcVer" != "vc7" && "$theVcVer" != "vc8" && "$theVcVer" != "vc9" } {
+      lappend aVcFiles [osutils:vcxproj:filters $theOutDir $aProjName aVcFilesCxx aVcFilesHxx]
+    }
+
+    # write resource file
+    lappend aVcFiles [osutils:readtemplate:rc $theOutDir $aProjName]
+
+    set aCommonSettingsFileTmpl ""
+    if { "$theVcVer" == "vc7" || "$theVcVer" == "vc8" } {
+      # nothing
+    } elseif { "$theVcVer" == "vc9" } {
+      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcproj.user.vc9x"]
+    } else {
+      set aCommonSettingsFileTmpl [wokUtils:FILES:FileToString "$::THE_CASROOT/adm/templates/vcxproj.user.vc10x"]
+    }
+    if { "$aCommonSettingsFileTmpl" != "" } {
+      regsub -all -- {__VCVER__} $aCommonSettingsFileTmpl $aVCRTVer aCommonSettingsFileTmpl
+
+      set aFile [open [set aVcFilePath "$aCommonSettingsFile"] w]
+      fconfigure $aFile -translation crlf
+      puts $aFile $aCommonSettingsFileTmpl
+      close $aFile
+
+      lappend aVcFiles "$aCommonSettingsFile"
+    }
+  }
  return $aVcFiles
 }

--- a/adm/scripts/android_build.bat
+++ b/adm/scripts/android_build.bat
@@ -33,7 +33,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"

 rem Optional 3rd-party libraries to enable
 set "USE_FREETYPE=ON"
@@ -167,7 +166,6 @@ if ["%toCMake%"] == ["1"] (
 -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
 -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
 -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="OFF" ^
 -D BUILD_MODULE_Draw:BOOL="OFF" ^
 -D BUILD_DOC_Overview:BOOL="OFF" ^
 -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^
--- a/adm/scripts/android_custom.bat.template
+++ b/adm/scripts/android_custom.bat.template
@@ -27,7 +27,6 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
-rem set "BUILD_MODULE_DETools=OFF"

 rem Optional 3rd-party libraries to enable
 rem set "USE_RAPIDJSON=ON"
--- a/adm/scripts/cmake_custom.bat.template
+++ b/adm/scripts/cmake_custom.bat.template
@@ -33,7 +33,6 @@ rem set BUILD_PATCH=

 rem set BUILD_MODULE_ApplicationFramework=ON
 rem set BUILD_MODULE_DataExchange=ON
-rem set BUILD_MODULE_DETools=OFF
 rem set BUILD_MODULE_Draw=ON
 rem set BUILD_MODULE_ModelingAlgorithms=ON
 rem set BUILD_MODULE_ModelingData=ON
--- a/adm/scripts/cmake_custom.sh.template
+++ b/adm/scripts/cmake_custom.sh.template
@@ -26,7 +26,6 @@ FREETYPE_DIR="$OCCT3RDPARTY/freetype-2.7.1"

 #BUILD_MODULE_ApplicationFramework=ON
 #BUILD_MODULE_DataExchange=ON
-#BUILD_MODULE_DETools=OFF
 #BUILD_MODULE_Draw=ON
 #BUILD_MODULE_ModelingAlgorithms=ON
 #BUILD_MODULE_ModelingData=ON
--- a/adm/scripts/cmake_gen.bat
+++ b/adm/scripts/cmake_gen.bat
@@ -28,7 +28,6 @@ set BUILD_FORCE_RelWithDebInfo=OFF

 set BUILD_MODULE_ApplicationFramework=ON
 set BUILD_MODULE_DataExchange=ON
-set BUILD_MODULE_DETools=OFF
 set BUILD_MODULE_Draw=ON
 set BUILD_MODULE_ModelingAlgorithms=ON
 set BUILD_MODULE_ModelingData=ON
@@ -63,7 +62,6 @@ cmake -G "%arch_compile%" ^
  -D BUILD_LIBRARY_TYPE:STRING=%BUILD_LIBRARY_TYPE% ^
  -D BUILD_MODULE_ApplicationFramework:BOOL=%BUILD_MODULE_ApplicationFramework% ^
  -D BUILD_MODULE_DataExchange:BOOL=%BUILD_MODULE_DataExchange% ^
-  -D BUILD_MODULE_DETools:BOOL=%BUILD_MODULE_DETools% ^
  -D BUILD_MODULE_Draw:BOOL=%BUILD_MODULE_Draw% ^
  -D BUILD_MODULE_FoundationClasses:BOOL=ON ^
  -D BUILD_MODULE_ModelingAlgorithms:BOOL=%BUILD_MODULE_ModelingAlgorithms% ^
--- a/adm/scripts/cmake_gen.sh
+++ b/adm/scripts/cmake_gen.sh
@@ -31,7 +31,6 @@ BUILD_ENABLE_FPE_SIGNAL_HANDLER=ON

 BUILD_MODULE_ApplicationFramework=ON
 BUILD_MODULE_DataExchange=ON
-BUILD_MODULE_DETools=OFF
 BUILD_MODULE_Draw=ON
 BUILD_MODULE_ModelingAlgorithms=ON
 BUILD_MODULE_ModelingData=ON
@@ -64,7 +63,6 @@ cmake -G "Unix Makefiles" \
  -D BUILD_LIBRARY_TYPE:STRING=$BUILD_LIBRARY_TYPE \
  -D BUILD_MODULE_ApplicationFramework:BOOL=$BUILD_MODULE_ApplicationFramework \
  -D BUILD_MODULE_DataExchange:BOOL=$BUILD_MODULE_DataExchange \
-  -D BUILD_MODULE_DETools:BOOL=$BUILD_MODULE_DETools \
  -D BUILD_MODULE_Draw:BOOL=$BUILD_MODULE_Draw \
  -D BUILD_MODULE_FoundationClasses:BOOL=ON \
  -D BUILD_MODULE_ModelingAlgorithms:BOOL=$BUILD_MODULE_ModelingAlgorithms \
--- a/adm/scripts/ios_build.sh
+++ b/adm/scripts/ios_build.sh
@@ -34,7 +34,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF

 export USE_FREETYPE=ON
 export USE_FREEIMAGE=OFF
@@ -149,7 +148,6 @@ function buildArch {
  -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
  -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
  -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
  -D BUILD_MODULE_Draw:BOOL="OFF" \
  -D BUILD_DOC_Overview:BOOL="OFF" \
    "$aCasSrc" 2>&1 | tee -a "$aLogFile"
--- a/adm/scripts/ios_custom.sh.template
+++ b/adm/scripts/ios_custom.sh.template
@@ -20,7 +20,6 @@ export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-ios"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF

 #export USE_RAPIDJSON=ON
 #export USE_DRACO=ON
--- a/adm/scripts/macos_build.sh
+++ b/adm/scripts/macos_build.sh
@@ -34,7 +34,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF
 export BUILD_Draw=ON

 export USE_FREETYPE=ON
@@ -146,7 +145,6 @@ function buildArch {
  -D BUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
  -D BUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
  -D BUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-  -D BUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
  -D BUILD_MODULE_Draw:BOOL="${BUILD_Draw}" \
  -D BUILD_DOC_Overview:BOOL="OFF" \
    "$aCasSrc" 2>&1 | tee -a "$aLogFile"
--- a/adm/scripts/macos_custom.sh.template
+++ b/adm/scripts/macos_custom.sh.template
@@ -19,7 +19,6 @@ export aDraco="$aSrcRoot/../3rdparty/draco-1.4.1-macos"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF
 #export BUILD_Draw=ON

 #export USE_RAPIDJSON=ON
--- a/adm/scripts/mingw_build.bat
+++ b/adm/scripts/mingw_build.bat
@@ -32,7 +32,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 set "BUILD_Draw=ON"

 rem Optional 3rd-party libraries to enable
@@ -156,7 +155,6 @@ if ["%toCMake%"] == ["1"] (
 -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
 -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
 -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
 -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
 -D 3RDPARTY_TCL_DIR:PATH="%aTclTk%" ^
 -D 3RDPARTY_TCL_INCLUDE_DIR:FILEPATH="%aTclTk%/include" ^
--- a/adm/scripts/mingw_custom.bat.template
+++ b/adm/scripts/mingw_custom.bat.template
@@ -22,7 +22,6 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
-rem set "BUILD_DETools=OFF"
 rem set "BUILD_Draw=ON"

 rem set "USE_RAPIDJSON=ON"
--- a/adm/scripts/wasm_build.bat
+++ b/adm/scripts/wasm_build.bat
@@ -32,7 +32,6 @@ set "BUILD_ModelingAlgorithms=ON"
 set "BUILD_Visualization=ON"
 set "BUILD_ApplicationFramework=ON"
 set "BUILD_DataExchange=ON"
-set "BUILD_DETools=OFF"
 set "BUILD_Draw=OFF"

 rem Optional 3rd-party libraries to enable
@@ -176,7 +175,6 @@ if ["%toCMake%"] == ["1"] (
 -D BUILD_MODULE_Visualization:BOOL="%BUILD_Visualization%" ^
 -D BUILD_MODULE_ApplicationFramework:BOOL="%BUILD_ApplicationFramework%" ^
 -D BUILD_MODULE_DataExchange:BOOL="%BUILD_DataExchange%" ^
- -D BUILD_MODULE_DETools:BOOL="%BUILD_DETools%" ^
 -D BUILD_MODULE_Draw:BOOL="%BUILD_Draw%" ^
 -D BUILD_DOC_Overview:BOOL="OFF" ^
 -D USE_FREETYPE:BOOL="%USE_FREETYPE%" ^
--- a/adm/scripts/wasm_build.sh
+++ b/adm/scripts/wasm_build.sh
@@ -20,7 +20,6 @@ export BUILD_ModelingAlgorithms=ON
 export BUILD_Visualization=ON
 export BUILD_ApplicationFramework=ON
 export BUILD_DataExchange=ON
-export BUILD_DETools=OFF

 if [ -f "${aScriptDir}/wasm_custom.sh" ] ; then
  . "${aScriptDir}/wasm_custom.sh"
@@ -75,7 +74,6 @@ echo cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"

@@ -94,7 +92,6 @@ cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE:FILEPATH="${aToolchain}" \
 -DBUILD_MODULE_Visualization:BOOL="${BUILD_Visualization}" \
 -DBUILD_MODULE_ApplicationFramework:BOOL="${BUILD_ApplicationFramework}" \
 -DBUILD_MODULE_DataExchange:BOOL="${BUILD_DataExchange}" \
-DBUILD_MODULE_DETools:BOOL="${BUILD_DETools}" \
 -DBUILD_MODULE_Draw:BOOL="OFF" \
 -DBUILD_DOC_Overview:BOOL="OFF" "${aSrcRoot}"

--- a/adm/scripts/wasm_custom.bat.template
+++ b/adm/scripts/wasm_custom.bat.template
@@ -23,7 +23,6 @@ rem set "BUILD_ModelingAlgorithms=ON"
 rem set "BUILD_Visualization=ON"
 rem set "BUILD_ApplicationFramework=ON"
 rem set "BUILD_DataExchange=ON"
-rem set "BUILD_DETools=OFF"

 rem set "USE_RAPIDJSON=ON"
 rem set "USE_DRACO=ON"
--- a/adm/scripts/wasm_custom.sh.template
+++ b/adm/scripts/wasm_custom.sh.template
@@ -14,4 +14,3 @@ export EMSDK_ROOT="$aSrcRoot/../emsdk"
 #export BUILD_Visualization=ON
 #export BUILD_ApplicationFramework=ON
 #export BUILD_DataExchange=ON
-#export BUILD_DETools=OFF
--- a/dox/FILES_HTML.txt
+++ b/dox/FILES_HTML.txt
@@ -45,7 +45,6 @@ user_guides/visualization/visualization.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
-user_guides/de_wrapper/de_wrapper.md
 user_guides/ocaf/ocaf.md
 user_guides/draw_test_harness/draw_test_harness.md
 user_guides/inspector/inspector.md
--- a/dox/FILES_PDF.txt
+++ b/dox/FILES_PDF.txt
@@ -20,7 +20,6 @@ user_guides/vis/vis.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
-user_guides/de_wrapper/de_wrapper.md
 user_guides/inspector/inspector.md
 user_guides/draw_test_harness/draw_test_harness.md

--- a/dox/build/build_3rdparty/building_3rdparty.md
+++ b/dox/build/build_3rdparty/building_3rdparty.md
@@ -128,9 +128,8 @@ You can download its sources from https://freetype.org/

@subsection dev_guides__building_3rdparty_win_3_1 TBB

-This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/oneapi-src/oneTBB/releases/tag/v2021.5.0.
-Go to the **Download** page, find the release version you need (e.g. `oneTBB 2021.5.0`) and pick the archive for Windows platform.
-To install, unpack the downloaded archive of TBB product (`oneapi-tbb-2021.5.0-win.zip`)
+This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the release version you need (e.g. `tbb30_018oss`) and pick the archive for Windows platform.

 Unpack the downloaded archive of TBB product into the `3rdparty` folder.

@@ -305,9 +304,9 @@ Download the necessary archive from https://freetype.org/ and unpack it.

@subsection dev_guides__building_3rdparty_linux_3_1 TBB

-This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/oneapi-src/oneTBB/releases/tag/v2021.5.0.
-Go to the **Download** page, find the release version you need (e.g. `oneTBB 2021.5.0`) and pick the archive for Linux platform.
-To install, unpack the downloaded archive of TBB product (`oneapi-tbb-2021.5.0-lin.tgz`).
+This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the release version you need and pick the archive for Linux platform.
+To install, unpack the downloaded archive of TBB product.

@subsection dev_guides__building_3rdparty_linux_3_3 FreeImage

@@ -478,9 +477,9 @@ Download the necessary archive from https://freetype.org/ and unpack it.

@subsection dev_guides__building_3rdparty_osx_3_1 TBB

-This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/oneapi-src/oneTBB/releases/tag/v2021.5.0.
-Go to the **Download** page, find the release version you need (e.g. `oneTBB 2021.5.0`) and pick the archive for Mac OS X platform.
-To install, unpack the downloaded archive of TBB product (`oneapi-tbb-2021.5.0-mac.tgz`).
+This third-party product is installed with binaries from the archive that can be downloaded from https://github.com/intel/tbb.
+Go to the **Download** page, find the release version you need (e.g. `tbb30_018oss`) and pick the archive for Mac OS X platform.
+To install, unpack the downloaded archive of TBB product (`tbb30_018oss_osx.tgz`).

@subsection dev_guides__building_3rdparty_osx_3_3 FreeImage

--- a/dox/introduction/introduction.md
+++ b/dox/introduction/introduction.md
@@ -360,7 +360,7 @@ https://dev.opencascade.org/resources/download/3rd-party-components
 | Component | Where to find | Used for | Purpose |
 | --------- | ------------- | -------- | -------------------- |
 | CMake 3.1+ | https://cmake.org/ | Configuration | Build from sources |
-| Intel oneTBB 2021.5.0 | https://github.com/oneapi-src/oneTBB/releases/tag/v2021.5.0 | All | Parallelization of algorithms (alternative to built-in thread pool) |
+| Intel TBB 4.x or later | https://oneapi-src.github.io/oneTBB/ | All | Parallelization of algorithms (alternative to built-in thread pool) |
 | OpenGL 3.3+, OpenGL ES 2.0+ | System | Visualization | Required for using 3D Viewer |
 | OpenVR 1.10+ | https://github.com/ValveSoftware/openvr | Visualization | VR (Virtual Reality) support in 3D Viewer |
 | FreeType 2.4+ | https://www.freetype.org/download.html | Visualization | Text rendering in 3D Viewer |
@@ -572,7 +572,8 @@ FreeType 2 is released under two open-source licenses: BSD-like FreeType License
 It is a library that helps you to take advantage of multi-core processor performance without having to be a threading expert. 
 Threading Building Blocks is not just a threads-replacement library. It represents a higher-level, task-based parallelism that 
 abstracts platform details and threading mechanisms for scalability and performance. 
-Intel oneTBB 2021.5.0 is available under Apache 2.0 license (https://www.threadingbuildingblocks.org).
+TBB version 2017 is available under Apache 2.0 license, while older versions 
+until 4.4 are available under GPLv2 license with the runtime exception (https://www.threadingbuildingblocks.org).

 **OpenGL** is an industry standard API for 3D graphics used by OCCT for 
 implementation of 3D viewer. OpenGL specification is developed by the
--- a/dox/upgrade/upgrade.md
+++ b/dox/upgrade/upgrade.md
@@ -2338,8 +2338,3 @@ or to include system OpenGL headers in advance (with help of `OpenGl_GlNative.hx

 Method `StdPrs_ToolTriangulatedShape::Normal()` has been removed.
 Please use `BRepLib_ToolTriangulatedShape::ComputeNormals()` to fill in normal attributes in triangulation and fetch them directly using `Poly_Triangulation::Normal()`.
-
-@subsection upgrade_occt770_shapeproximity BRepExtrema_ShapeProximity
-
-A new way of using the `BRepExtrema_ShapeProximity` class was provided for computing a proximity value between two shapes.
-If at initialization of the `BRepExtrema_ShapeProximity` class the *theTolerance* parameter is not defined (Precision::Infinite() by default), the proximity value will be computed.
--- a/dox/user_guides/de_wrapper/de_wrapper.md
+++ b/dox/user_guides/de_wrapper/de_wrapper.md
@@ -1,413 +0,0 @@
-Data Exchange Wrapper (DE_Wrapper)  {#occt_user_guides__de_wrapper}
-============================
-
-@tableofcontents
-
-@section occt_de_wrapper_1 Introduction
-
-This guide explains how to use the **Data Exchange Wrapper** (DE Wrapper).
-It provides basic directions on setup, usage and file creation via DE_Wrapper.
-
-The Data Exchange Wrapper (DE Wrapper) module allows reading and writing supported CAD formats to shape objects or special XDE documents, setting up the transfer process for all CAD files.
-
-It is also possible to add support for new CAD formats by prototyping existing tools.
-
-The DE Wrapper component requires @ref occt_user_guides__xde "XDE" toolkit for operation.
-
-This guide mainly explains how to convert CAD files to Open CASCADE Technology (OCCT) shapes and vice versa.
-This guide principally deals with the following OCCT classes:
-  * The Provider class, which loads CAD files and translates their contents to OCCT shapes or XDE documents, or translates OCCT shapes or XDE documents to CAD entities and then writes those entities to a CAD file.
-  * The Configuration class, which contains all information for the transfer process, such as the units, tolerance, and all internal information for the OCC readers or writers.
-  * The wrapper class, which contains all loaded configuration objects with own CAD format, reads or writes CAD files in the format derived from file extension or contents and saves or loads configuration settings for loaded configuration objects.
-
-@section occt_de_wrapper_2 Supported CAD formats
-
-| CAD format | Extensions | RW support | Thread Safety | Presentation | Package |
-| :--------- | :--------- | :--------- | :----------- | :----------- | :------ |
-| STEP | .stp, .step .stepz | RW | No | BRep, Mesh | STEPCAFControl |
-| XCAF | .xbf | RW | Yes | BRep, Mesh | DEXCAFCascade |
-| BREP | .brep | RW | Yes | BRep, Mesh | DEBRepCascade |
-| IGES | .igs, .iges | RW | No | BRep | IGESCAFControl |
-| OBJ | .obj | RW | Yes | Mesh | RWObj |
-| STL | .stl | RW | Yes | Mesh | RWStl |
-| PLY | .ply | W | Yes | Mesh | RWPly |
-| GLTF | .glTF .glb | RW | Yes | Mesh | RWGltf |
-| VRML | .wrl .vrml | RW | Yes | Mesh | Vrml |
-
-**Note** :
-  * The format names in the first column match the FormatName values used for configuration nodes.
-  * The VendorName for all listed CAD formats is "OCC".
-
-@section occt_de_wrapper_3 DE Session Configuration
-
-Any providers can have their own read/write parameters. The transfer process is set up using DE configuration nodes, which hold all relevant parameters. There are two ways to change the parameter values: directly from code or by an external resource file/string.
-The session is a global or static DE_Wrapper object that stores registered DE configuration nodes and wraps DE commands to work with them. It has some configuration parameters of its own and also keeps track of loaded nodes and specilal global parameters.
-
-@subsection occt_de_wrapper_3_1 Getting a DE session. Code sample
-
-Working with a DE session requires a DE_Wrapper object to be loaded or created first.
-
-Getting the global DE_Wrapping object:
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-~~~~
-Creating a local DE_Wrapper:
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = new DE_Wrapper();
-~~~~
-It is recommended to create a local one-time copy to work with the session, if no global changes are intended.
-~~~~{.cpp}
-Handle(DE_Wrapper) aOneTimeSession = aSession->Copy();
-~~~~
-@subsection occt_de_wrapper_3_2 Configuration resource
-
-Configuration resource is an external file or string of the following format:
-~~~~{.cpp}
-global.priority.STEP :   OCC DTK
-global.general.length.unit :     1
-provider.STEP.OCC.read.precision.val :   0.0001
-~~~~
-
-@subsubsection occt_de_wrapper_3_2_1 Configuration resource: graph of scopes
-   * **global.** is a scope of global parameters
-     *  **priority.** is a scope of priority to use vendors with their providers.
-     *  **general.** is a scope of global configuration parameter values
-     *  <strong>"..."</strong> is an internal configuration with any internal scopes
-     *  <strong>". : "</strong> is a separator of key-value
-     *  __...__ parameter value, can't contain new line symbols.
-   * **provider.** is a scope of configuration providers
-     *  **STEP.** is a scope of CAD format to configure
-     *  **OCC.** is a scope of a vendor or provider
-     *  <strong>"..."</strong> is an internal configuration with any internal scopes
-     *  <strong>". : "</strong> is a separator of key-value
-     *  <strong>"..."</strong> parameter value, can't contain new line symbols.
-
-@subsubsection occt_de_wrapper_3_2_2 Loading configuration resources. Configuring DE Session
-
-The resource should be loaded after the registration of all providers that should be configured. The resource only impacts registered parameters. To configure a new registered provider it is necessary to load the resource again. Parameters not present in the resource will remain unchanged.
-
-There are two ways to check what parameters are available:
-* C++: Open ConfigureNode file and check the InternalParameter field. Each parameter will be described with a comment. To check the global parameters, use the DE_Wrapper class public methods.
-* Resource: Register all available Nodes to the session, then save the configuration and view all existing parameters.
-
-There are two options for loading a resource: recursive and global parameters only. Recursive is the default option to configure all global parameters (units, priority, enable status) and all registered providers. Non-recursive configures only global parameters and ignores all provider settings. This option is the best for updating provider priority.
-
-@subsubsection occt_de_wrapper_3_2_3 Loading configuration resources. Code sample
-
-Configuring using a resource string:
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aString =
-    "global.priority.STEP :   OCC DTK\n"
-    "global.general.length.unit : 1\n"
-    "provider.STEP.OCC.read.precision.val : 0.\n";
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Load(aString, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-~~~~
-Configuring using a resource file:
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "";
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Load(aPathToFile, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-~~~~
-@subsubsection occt_de_wrapper_3_2_4 Loading configuration resources. DRAW sample
-
-Configuring using a resource string:
-~~~~{.cpp}
-set conf "
-global.priority.STEP :   OCC
-global.general.length.unit :     1
-provider.STEP.OCC.read.iges.bspline.continuity :         1
-provider.STEP.OCC.read.precision.mode :  0
-provider.STEP.OCC.read.precision.val :   0.0001
-"
-LoadConfiguration ${conf} -recursive on
-~~~~
-
-Configuring using a resource file:
-~~~~{.cpp}
-set pathToFile ""
-LoadConfiguration ${pathToFile} -recursive on
-~~~~
-
-@subsubsection occt_de_wrapper_3_2_5 Saving configuration resources. Dump of configuration DE Session
-
-Saving the configuration of a DE Session involves dumping all parameters of registered providers.
-If a parameter did not change during the session, its value remains as default.
-
-There are two ways to save a resource: recursive and global parameters only. Recursive is the way to dump all registered provider information. Non-recursive dumps only global parameters, for example, save priority of vendors or the length unit.
-
-It is possible to filter what vendors or providers to save by providing the correct name of the vendor or provider.
-
-@subsubsection occt_de_wrapper_3_2_6 Saving configuration resources. Code sample
-
-Dump to resource string. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TColStd_ListOfAsciiString aFormats;
-  TColStd_ListOfAsciiString aVendors;
-  aFormats.Appends("STEP");
-  aVendors.Appends("OCC");
-  Standard_Boolean aIsRecursive = Standard_True;
-  TCollection_AsciiString aConf = aSession->aConf->Save(aIsRecursive, aFormats, aVendors);
-~~~~
-Configure using a resource file. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "";
-  TColStd_ListOfAsciiString aFormats;
-  TColStd_ListOfAsciiString aVendors;
-  aFormats.Appends("STEP");
-  aVendors.Appends("OCC");
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Save(aPathToFile, aIsRecursive, aFormats,aVendors))
-  {
-    Message::SendFail() << "Error: configuration is not saved";
-  }
-~~~~
-@subsubsection occt_de_wrapper_3_2_7 Saving configuration resources. DRAW sample
-
-Dump configuration to string. If no list of vendors is passed or it is empty, all vendors are saved. If no providers list is passed or it is empty, all providers of valid vendors are saved.
-~~~~{.cpp}
-set vendors "OCC"
-set format "STEP"
-set dump_conf [DumpConfiguration -recursive on -format ${format} -vendor ${vendors}]
-~~~~
-
-Dump configuration to file. If no vendors list are set as an argument or it is empty, saves all vendors. If no providers list as argument or it is empty, saves all providers of valid vendors:
-~~~~{.cpp}
-set vendors "OCC"
-set format "STEP"
-set pathToFile ""
-DumpConfiguration -path ${pathToFile} -recursive on -format ${format} -vendor ${vendors}
-~~~~
-
-@subsection occt_de_wrapper_3_3 Registering providers
-
-To transfer a CAD file using DE Wrapper, it is necessary to register a CAD provider.
-The provider contains internal and global parameters that have default values in the creation stage.
-All registered providers are set to the map with information about its vendor and kept as smart handles. Therefore, it is possible to change the values via handle from external code.
-
-@subsubsection occt_de_wrapper_3_3_1 Registering providers. Code sample
-
-It is nesessary to register only one ConfigurationNode for all needed formats.
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-Handle(DE_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
-aSession->Bind(aNode);
-~~~~
-@subsubsection occt_de_wrapper_3_3_2 Registering providers. DRAW Sample
-
-Use DRAW with all providers registered by the following command:
-~~~~{.cpp}
-pload XDE
-~~~~
-
-@subsubsection occt_de_wrapper_3_3_3 Realtime initialization. Code sample
-
-It is possible to change a paramater from code using a smart pointer.
-
-~~~~{.cpp}
-// global variable
-static Handle(STEPCAFControl_ConfigurationNode) THE_STEP_NODE;
-
-static Handle(DE_ConfigurationNode) RegisterStepNode()
-{
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  if (!THE_STEP_NODE.IsNull())
-  {
-    return THE_STEP_NODE;
-  }
-
-  THE_STEP_NODE = new STEPCAFControl_ConfigurationNode();
-  aSession->Bind(THE_STEP_NODE);
-  return THE_STEP_NODE;
-}
-
-// Change parameter value
-THE_STEP_NODE->InternalParameters.ReadRelationship = false;
-THE_STEP_NODE->InternalParameters.ReadName = false;
-THE_STEP_NODE->InternalParameters.ReadProps = false;
-~~~~
-
-@subsection occt_de_wrapper_3_4 Priority of Vendors
-
-DE session is able to work with several vendors with the same supported CAD format. To choose the preffered vendor for each format, use a special priority list.
-
-If the high priority vendor's provider is not supported, a transfer operation is needed (write/read), then the next vendor will be chosen.
-
-@subsubsection occt_de_wrapper_3_4_1 Priority of Vendors. Code sample
-
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aFormat = "STEP";
-  TColStd_ListOfAsciiString aVendors;
-  aVendors.Appends("OCC"); // high priority
-  aVendors.Appends("DTK");
-  // Flag to disable not choosen vendors, in this case configuration is possible
-  // otherwise, lower their priority and continue to check ability to transfer
-  Standard_Boolean aToDisable = Standard_True;
-  aSession->ChangePriority(aFormat, aVendors, aToDisable);
-~~~~
-
-@subsubsection occt_de_wrapper_3_4_2 Priority of Vendors. DRAW Sample
-
-It is recommended to disable recursion and update only global parameters.
-~~~~{.cpp}
-set conf "
-global.priority.STEP :   OCC DTK
-"
-LoadConfiguration ${conf} -recursive off
-~~~~
-
-@section occt_de_wrapper_4 Transfer of CAD files
-
-To transfer from a CAD file to OCC or from OCC to a CAD file, it is necessary to use a configured DE_Wrapper object. It can be local, one-time or global. Global configuration of DE_Wrapper propagates to all nodes via transfer. There are two options for transferring: using OCC shape or XCAF document. It is possible to work only with real path to/from the file. Streaming is not supported (yet).
-
-The format of input/output file is automatically determined by its extension or contents.
-
-@subsection occt_de_wrapper_4_1 Transfer of CAD files. Code samples
-
-Reading STEP file to Shape.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShRes;
-  if (!aSession->Read(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-Writing Shape to STEP file.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShFrom = ...;
-  if (!aSession->Write(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't write file";
-  }
-~~~~
-
-Reading STEP file into XCAF document.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  Handle(TDocStd_Document) aDoc = ...;
-  if (!aSession->Read(aPathToFile, aDoc))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-Writing XCAF document into STEP.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  Handle(TDocStd_Document) aDoc = ...;
-  if (!aSession->Write(aPathToFile, aDoc))
-  {
-    Message::SendFail() << "Error: Can't write file";
-  }
-~~~~
-
-@subsection occt_de_wrapper_4_2 Transfer of CAD files. DRAW samples
-
-Reading a STEP file into a Shape.
-~~~~{.cpp}
-set fileName "sample.stp"
-readfile shape ${fileName}
-~~~~
-
-Writing a Shape into STEP.
-~~~~{.cpp}
-set fileName "sample.stp"
-writefile shape ${fileName}
-~~~~
-
-Reading STEP into XCAF document.
-~~~~{.cpp}
-set fileName "sample.stp"
-ReadFile D ${fileName}
-~~~~
-
-Writing XCAF document into STEP.
-~~~~{.cpp}
-set fileName "sample.stp"
-WriteFile D ${fileName}
-~~~~
-
-@subsection occt_de_wrapper_4_3 Transfer using DE Provider. Code sample
-
-It is possible to read and write CAD files directly from a special provider.
-
-~~~~{.cpp}
-// Creating or getting node
-Handle(STEPCAFControl_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
-// Creationg an one-time provider
-Handle(DE_Provider) aProvider = aNode->BuildProvider();
-// Setting configuration with all parameters
-aProvider->SetNode(aNode);
-if (!aProvider->Read(...))
-{
-  Message::SendFail() << "Error: Can't read STEP file";
-}
-if (!aProvider->Write(...))
-{
-  Message::SendFail() << "Error: Can't write STEP file";
-}
-~~~~
-
-@subsection occt_de_wrapper_4_4 Temporary configuration via transfer
-
-It is possible to change the configuration of only one transfer operation. To avoid changing parameters in a session, one-time clone of the session can be created and used for transfer. This way is recommended for use in multithreaded mode.
-
-@subsubsection occt_de_wrapper_4_4_1 Temporary configuration via transfer. Code sample
-
-Code sample to configure via transfer.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper()->Copy();
-  TCollection_AsciiString aString =
-    "global.priority.STEP :   OCC DTK\n"
-    "global.general.length.unit : 1\n"
-    "provider.STEP.OCC.read.precision.val : 0.\n";
-  if (!aSession->Load(aString, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShRes;
-  if (!aSession->Read(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-@subsubsection occt_de_wrapper_4_4_2 Temporary configuration via transfer. DRAW sample
-
-Code sample to configure via transfer within DRAW command.
-~~~~{.cpp}
-set fileName "sample.stp"
-readfile S5 $filename -conf "global.general.length.unit : 1000 "
-~~~~
-
-Code sample to configure via transfer as variable.
-~~~~{.cpp}
-set fileName "sample.stp"
-set conf "
-global.priority.STEP :   OCC
-global.general.length.unit :     1
-provider.STEP.OCC.read.iges.bspline.continuity :         1
-provider.STEP.OCC.read.precision.mode :  0
-provider.STEP.OCC.read.precision.val :   0.0001
-"
-readfile S5 $filename -conf ${conf}
-~~~~
--- a/dox/user_guides/foundation_classes/foundation_classes.md
+++ b/dox/user_guides/foundation_classes/foundation_classes.md
@@ -1331,7 +1331,7 @@ Therefore if the user of *NCollection* does not specify any allocator as a param
 Nevertheless, it is possible to define a custom *Allocator* type to manage the memory in the most optimal or convenient way for this algorithm.

 As one possible choice, the class *NCollection_IncAllocator* is included.
-Unlike *NCollection_BaseAllocator*, the memory is allocated in big blocks (about 12kB) and the allocator keeps track of the amount of occupied memory.
+Unlike *NCollection_BaseAllocator*, the memory is allocated in big blocks (about 20kB) and the allocator keeps track of the amount of occupied memory.
 The method *Allocate* just increments the pointer to non-occupied memory and returns its previous value.
 Memory is only released in the destructor of *NCollection_IncAllocator*, the method *Free* is empty.
 If used properly, this Allocator can greatly improve the performance of specific algorithms.
--- a/dox/user_guides/user_guides.md
+++ b/dox/user_guides/user_guides.md
@@ -13,7 +13,6 @@ OCCT User Guides are organized by OCCT modules:
 * @subpage occt_user_guides__iges "IGES Translator"
 * @subpage occt_user_guides__step "STEP Translator"
 * @subpage occt_user_guides__xde "Extended Data Exchange (XDE)"
-* @subpage occt_user_guides__de_wrapper "Data Exchange Wrapper (DE Wrapper)"
 * @subpage occt_user_guides__ocaf "Open CASCADE Application Framework (OCAF)"
 * @subpage occt_user_guides__test_harness "DRAW Test Harness"
 * @subpage occt_user_guides__inspector "Inspector"
--- a/samples/qt/Interface/src/Translate.cxx
+++ b/samples/qt/Interface/src/Translate.cxx
@@ -221,7 +221,7 @@ Handle(TopTools_HSequenceOfShape) Translate::importModel( const int format, cons
            shapes = importSTEP( file );
            break;
        }
-    } catch ( const Standard_Failure& ) {
+    } catch ( Standard_Failure ) {
        shapes.Nullify();
    }
    return shapes;
@@ -256,7 +256,7 @@ bool Translate::exportModel( const int format, const QString& file, const Handle
        case FormatSTL:  return exportSTL ( file, shapes );
        case FormatVRML: return exportVRML( file, shapes );
        }
-    } catch ( const Standard_Failure& ) {
+    } catch ( Standard_Failure ) {
        //
    }
    return false;
@@ -528,26 +528,26 @@ bool Translate::exportSTL( const QString& file, const Handle(TopTools_HSequenceO
    if ( shapes.IsNull() || shapes->IsEmpty() )
        return false;

-    TopoDS_Compound res;
-    BRep_Builder builder;
-    builder.MakeCompound( res );
+	TopoDS_Compound res;
+	BRep_Builder builder;
+	builder.MakeCompound( res );

-    for ( int i = 1; i <= shapes->Length(); i++ )
-    {
-        TopoDS_Shape shape = shapes->Value( i );
-        if ( shape.IsNull() ) 
-        {
-            myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
-            return false;
+	for ( int i = 1; i <= shapes->Length(); i++ )
+	{
+		TopoDS_Shape shape = shapes->Value( i );
+		if ( shape.IsNull() ) 
+		{
+			myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
+			return false;
        }
-        builder.Add( res, shape );
-    }
+		builder.Add( res, shape );
+	}

-    StlAPI_Writer writer;
-
-    const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
-
-    writer.Write( res, anUtf8Path.ToCString() );
+	StlAPI_Writer writer;
+	
+	const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
+	
+	writer.Write( res, anUtf8Path.ToCString() );

    return true;
 }
@@ -557,26 +557,26 @@ bool Translate::exportVRML( const QString& file, const Handle(TopTools_HSequence
    if ( shapes.IsNull() || shapes->IsEmpty() )
        return false;

-    TopoDS_Compound res;
-    BRep_Builder builder;
-    builder.MakeCompound( res );
+	TopoDS_Compound res;
+	BRep_Builder builder;
+	builder.MakeCompound( res );

-    for ( int i = 1; i <= shapes->Length(); i++ )
-    {
-        TopoDS_Shape shape = shapes->Value( i );
-        if ( shape.IsNull() )
-        {
-            myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
-            return false;
+	for ( int i = 1; i <= shapes->Length(); i++ )
+	{
+		TopoDS_Shape shape = shapes->Value( i );
+		if ( shape.IsNull() )
+		{
+			myInfo = QObject::tr( "INF_TRANSLATE_ERROR_INVALIDSHAPE" );
+			return false;
        }
-    builder.Add( res, shape );
-    }
+		builder.Add( res, shape );
+	}

-    VrmlAPI_Writer writer;
-
-    const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
-
-    writer.Write( res, anUtf8Path.ToCString() );
+	VrmlAPI_Writer writer;
+	
+	const TCollection_AsciiString anUtf8Path (file.toUtf8().data());
+	
+	writer.Write( res, anUtf8Path.ToCString() );

    return true;
 }
--- a/src/AIS/AIS_Animation.cxx
+++ b/src/AIS/AIS_Animation.cxx
@@ -251,9 +251,7 @@ void AIS_Animation::Stop()
  myState = AnimationState_Stopped;
  if (!myTimer.IsNull())
  {
-    const Standard_Real anElapsedTime = ElapsedTime();
    myTimer->Stop();
-    myTimer->Seek (Min (Duration(), anElapsedTime));
  }

  for (NCollection_Sequence<Handle(AIS_Animation)>::Iterator anIter (myAnimations); anIter.More(); anIter.Next())
--- a/src/AIS/AIS_AnimationAxisRotation.cxx
+++ b/src/AIS/AIS_AnimationAxisRotation.cxx
@@ -1,51 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <AIS_AnimationAxisRotation.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationAxisRotation, AIS_BaseAnimationObject)
-
-//=============================================================================
-//function : Constructor
-//purpose  :
-//=============================================================================
-AIS_AnimationAxisRotation::AIS_AnimationAxisRotation (const TCollection_AsciiString& theAnimationName,
-                                                      const Handle(AIS_InteractiveContext)& theContext,
-                                                      const Handle(AIS_InteractiveObject)& theObject,
-                                                      const gp_Ax1& theAxis,
-                                                      const Standard_Real theAngleStart,
-                                                      const Standard_Real theAngleEnd)
-: AIS_BaseAnimationObject (theAnimationName, theContext, theObject),
-  myRotAxis    (theAxis),
-  myAngleStart (theAngleStart),
-  myAngleEnd   (theAngleEnd)
-{
-  //
-}
-
-//=============================================================================
-//function : update
-//purpose  :
-//=============================================================================
-void AIS_AnimationAxisRotation::update (const AIS_AnimationProgress& theProgress)
-{
-  if (myObject.IsNull())
-  {
-    return;
-  }
-
-  gp_Trsf aTrsf;
-  Standard_Real aCurrentAngle = (1.0 - theProgress.LocalNormalized) * myAngleStart + theProgress.LocalNormalized * myAngleEnd;
-  aTrsf.SetRotation (myRotAxis, aCurrentAngle);
-  updateTrsf (aTrsf);
-}
--- a/src/AIS/AIS_AnimationAxisRotation.hxx
+++ b/src/AIS/AIS_AnimationAxisRotation.hxx
@@ -1,53 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _AIS_AnimationAxisRotation_HeaderFile
-#define _AIS_AnimationAxisRotation_HeaderFile
-
-#include <AIS_BaseAnimationObject.hxx>
-#include <gp_TrsfNLerp.hxx>
-
-//! Animation defining object transformation.
-class AIS_AnimationAxisRotation : public AIS_BaseAnimationObject
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_AnimationAxisRotation, AIS_BaseAnimationObject)
-public:
-
-  //! Constructor with initialization.
-  //! @param[in] theAnimationName animation identifier
-  //! @param[in] theContext       interactive context where object have been displayed
-  //! @param[in] theObject        object to apply rotation
-  //! @param[in] theAxis          rotation axis
-  //! @param[in] theAngleStart    rotation angle at the start of animation
-  //! @param[in] theAngleEnd      rotation angle at the end   of animation
-  Standard_EXPORT AIS_AnimationAxisRotation (const TCollection_AsciiString& theAnimationName,
-                                             const Handle(AIS_InteractiveContext)& theContext,
-                                             const Handle(AIS_InteractiveObject)& theObject,
-                                             const gp_Ax1& theAxis,
-                                             const Standard_Real theAngleStart,
-                                             const Standard_Real theAngleEnd);
-
-protected:
-
-  //! Update the progress.
-  Standard_EXPORT virtual void update (const AIS_AnimationProgress& theProgress) Standard_OVERRIDE;
-
-private:
-
-  gp_Ax1         myRotAxis;     //!< rotation axis
-  Standard_Real  myAngleStart;  //!< start angle for rotation
-  Standard_Real  myAngleEnd;    //!< end angle for rotation
-
-};
-
-#endif // _AIS_AnimationAxisRotation_HeaderFile
--- a/src/AIS/AIS_AnimationObject.cxx
+++ b/src/AIS/AIS_AnimationObject.cxx
@@ -14,7 +14,10 @@

 #include <AIS_AnimationObject.hxx>

-IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_BaseAnimationObject)
+#include <AIS_InteractiveContext.hxx>
+#include <V3d_View.hxx>
+
+IMPLEMENT_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_Animation)

 //=============================================================================
 //function : Constructor
@@ -25,7 +28,9 @@ AIS_AnimationObject::AIS_AnimationObject (const TCollection_AsciiString& theAnim
                                          const Handle(AIS_InteractiveObject)&  theObject,
                                          const gp_Trsf& theTrsfStart,
                                          const gp_Trsf& theTrsfEnd)
-: AIS_BaseAnimationObject (theAnimationName, theContext, theObject),
+: AIS_Animation (theAnimationName),
+  myContext  (theContext),
+  myObject   (theObject),
  myTrsfLerp (theTrsfStart, theTrsfEnd)
 {
  //
@@ -44,5 +49,52 @@ void AIS_AnimationObject::update (const AIS_AnimationProgress& theProgress)

  gp_Trsf aTrsf;
  myTrsfLerp.Interpolate (theProgress.LocalNormalized, aTrsf);
-  updateTrsf (aTrsf);
+  if (!myContext.IsNull())
+  {
+    myContext->SetLocation (myObject, aTrsf);
+    invalidateViewer();
+  }
+  else
+  {
+    myObject->SetLocalTransformation (aTrsf);
+  }
+}
+
+//=============================================================================
+//function : invalidateViewer
+//purpose  :
+//=============================================================================
+void AIS_AnimationObject::invalidateViewer()
+{
+  if (myContext.IsNull())
+  {
+    return;
+  }
+
+  const Standard_Boolean isImmediate = myContext->CurrentViewer()->ZLayerSettings (myObject->ZLayer()).IsImmediate();
+  if (!isImmediate)
+  {
+    myContext->CurrentViewer()->Invalidate();
+    return;
+  }
+
+  // Invalidate immediate view only if it is going out of z-fit range.
+  // This might be sub-optimal performing this for each animated objects in case of many animated objects.
+  for (V3d_ListOfView::Iterator aDefViewIter = myContext->CurrentViewer()->DefinedViewIterator();
+       aDefViewIter.More(); aDefViewIter.Next())
+  {
+    const Handle(V3d_View)& aView = aDefViewIter.Value();
+    const Bnd_Box aMinMaxBox  = aView->View()->MinMaxValues (Standard_False);
+    const Bnd_Box aGraphicBox = aView->View()->MinMaxValues (Standard_True);
+    Standard_Real aZNear = 0.0;
+    Standard_Real aZFar  = 0.0;
+    if (aView->Camera()->ZFitAll (aDefViewIter.Value()->AutoZFitScaleFactor(), aMinMaxBox, aGraphicBox, aZNear, aZFar))
+    {
+      if (aZNear < aView->Camera()->ZNear()
+       || aZFar  > aView->Camera()->ZFar())
+      {
+        aDefViewIter.Value()->Invalidate();
+      }
+    }
+  }
 }
--- a/src/AIS/AIS_AnimationObject.hxx
+++ b/src/AIS/AIS_AnimationObject.hxx
@@ -15,23 +15,24 @@
 #ifndef _AIS_AnimationObject_HeaderFile
 #define _AIS_AnimationObject_HeaderFile

-#include <AIS_BaseAnimationObject.hxx>
+#include <AIS_Animation.hxx>
+#include <AIS_InteractiveContext.hxx>
 #include <gp_TrsfNLerp.hxx>

 //! Animation defining object transformation.
-class AIS_AnimationObject : public AIS_BaseAnimationObject
+class AIS_AnimationObject : public AIS_Animation
 {
-  DEFINE_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_BaseAnimationObject)
+  DEFINE_STANDARD_RTTIEXT(AIS_AnimationObject, AIS_Animation)
 public:

  //! Constructor with initialization.
  //! Note that start/end transformations specify exactly local transformation of the object,
  //! not the transformation to be applied to existing local transformation.
-  //! @param[in] theAnimationName animation identifier
-  //! @param[in] theContext       interactive context where object have been displayed
-  //! @param[in] theObject        object to apply local transformation
-  //! @param[in] theTrsfStart     local transformation at the start of animation (e.g. theObject->LocalTransformation())
-  //! @param[in] theTrsfEnd       local transformation at the end   of animation
+  //! @param theAnimationName animation identifier
+  //! @param theContext       interactive context where object have been displayed
+  //! @param theObject        object to apply local transformation
+  //! @param theTrsfStart     local transformation at the start of animation (e.g. theObject->LocalTransformation())
+  //! @param theTrsfEnd       local transformation at the end   of animation
  Standard_EXPORT AIS_AnimationObject (const TCollection_AsciiString& theAnimationName,
                                       const Handle(AIS_InteractiveContext)& theContext,
                                       const Handle(AIS_InteractiveObject)&  theObject,
@@ -43,10 +44,17 @@ protected:
  //! Update the progress.
  Standard_EXPORT virtual void update (const AIS_AnimationProgress& theProgress) Standard_OVERRIDE;

-private:
+  //! Invalidate the viewer for proper update.
+  Standard_EXPORT void invalidateViewer();

-  gp_TrsfNLerp  myTrsfLerp; //!< interpolation tool
+protected:
+
+  Handle(AIS_InteractiveContext) myContext;   //!< context where object is displayed
+  Handle(AIS_InteractiveObject)  myObject;    //!< presentation object to set location
+  gp_TrsfNLerp                   myTrsfLerp;  //!< interpolation tool

 };

+DEFINE_STANDARD_HANDLE(AIS_AnimationObject, AIS_Animation)
+
 #endif // _AIS_AnimationObject_HeaderFile
--- a/src/AIS/AIS_BaseAnimationObject.cxx
+++ b/src/AIS/AIS_BaseAnimationObject.cxx
@@ -1,88 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <AIS_BaseAnimationObject.hxx>
-
-#include <V3d_View.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(AIS_BaseAnimationObject, AIS_Animation)
-
-//=============================================================================
-//function : Constructor
-//purpose  :
-//=============================================================================
-AIS_BaseAnimationObject::AIS_BaseAnimationObject (const TCollection_AsciiString& theAnimationName,
-                                                  const Handle(AIS_InteractiveContext)& theContext,
-                                                  const Handle(AIS_InteractiveObject)&  theObject)
-: AIS_Animation (theAnimationName),
-  myContext  (theContext),
-  myObject   (theObject)
-{
-  //
-}
-
-//=============================================================================
-//function : updateTrsf
-//purpose  :
-//=============================================================================
-void AIS_BaseAnimationObject::updateTrsf (const gp_Trsf& theTrsf)
-{
-  if (!myContext.IsNull())
-  {
-    myContext->SetLocation (myObject, theTrsf);
-    invalidateViewer();
-  }
-  else
-  {
-    myObject->SetLocalTransformation (theTrsf);
-  }
-}
-
-//=============================================================================
-//function : invalidateViewer
-//purpose  :
-//=============================================================================
-void AIS_BaseAnimationObject::invalidateViewer()
-{
-  if (myContext.IsNull())
-  {
-    return;
-  }
-
-  const Standard_Boolean isImmediate = myContext->CurrentViewer()->ZLayerSettings (myObject->ZLayer()).IsImmediate();
-  if (!isImmediate)
-  {
-    myContext->CurrentViewer()->Invalidate();
-    return;
-  }
-
-  // Invalidate immediate view only if it is going out of z-fit range.
-  // This might be sub-optimal performing this for each animated objects in case of many animated objects.
-  for (V3d_ListOfView::Iterator aDefViewIter = myContext->CurrentViewer()->DefinedViewIterator();
-       aDefViewIter.More(); aDefViewIter.Next())
-  {
-    const Handle(V3d_View)& aView = aDefViewIter.Value();
-    const Bnd_Box aMinMaxBox  = aView->View()->MinMaxValues (Standard_False);
-    const Bnd_Box aGraphicBox = aView->View()->MinMaxValues (Standard_True);
-    Standard_Real aZNear = 0.0;
-    Standard_Real aZFar  = 0.0;
-    if (aView->Camera()->ZFitAll (aDefViewIter.Value()->AutoZFitScaleFactor(), aMinMaxBox, aGraphicBox, aZNear, aZFar))
-    {
-      if (aZNear < aView->Camera()->ZNear()
-       || aZFar  > aView->Camera()->ZFar())
-      {
-        aDefViewIter.Value()->Invalidate();
-      }
-    }
-  }
-}
--- a/src/AIS/AIS_BaseAnimationObject.hxx
+++ b/src/AIS/AIS_BaseAnimationObject.hxx
@@ -1,49 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _AIS_BaseAnimationObject_HeaderFile
-#define _AIS_BaseAnimationObject_HeaderFile
-
-#include <AIS_Animation.hxx>
-#include <AIS_InteractiveContext.hxx>
-
-//! Animation defining object transformation.
-class AIS_BaseAnimationObject : public AIS_Animation
-{
-  DEFINE_STANDARD_RTTIEXT(AIS_BaseAnimationObject, AIS_Animation)
-protected:
-
-  //! Constructor with initialization.
-  //! @param[in] theAnimationName animation identifier
-  //! @param[in] theContext       interactive context where object have been displayed
-  //! @param[in] theObject        object to apply local transformation
-  Standard_EXPORT AIS_BaseAnimationObject (const TCollection_AsciiString& theAnimationName,
-                                           const Handle(AIS_InteractiveContext)& theContext,
-                                           const Handle(AIS_InteractiveObject)&  theObject);
-
-  //! Update the transformation.
-  Standard_EXPORT void updateTrsf (const gp_Trsf& theTrsf);
-
-private:
-
-  //! Invalidate the viewer for proper update.
-  Standard_EXPORT void invalidateViewer();
-
-protected:
-
-  Handle(AIS_InteractiveContext) myContext;   //!< context where object is displayed
-  Handle(AIS_InteractiveObject)  myObject;    //!< presentation object to set location
-
-};
-
-#endif // _AIS_BaseAnimationObject_HeaderFile
--- a/src/AIS/AIS_C0RegularityFilter.cxx
+++ b/src/AIS/AIS_C0RegularityFilter.cxx
@@ -56,7 +56,7 @@ AIS_C0RegularityFilter::AIS_C0RegularityFilter(const TopoDS_Shape& aShape)
      }
    }
    if (Ok) {
-      const TopoDS_Shape& curEdge = SubShapes.FindKey( i );
+      TopoDS_Shape curEdge = SubShapes.FindKey( i );
      myMapOfEdges.Add(curEdge);
    }
  }
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -945,7 +945,7 @@ void AIS_InteractiveContext::Redisplay (const AIS_KindOfInteractive theKOI,
  Standard_Boolean isRedisplayed = Standard_False;
  for (AIS_DataMapIteratorOfDataMapOfIOStatus anObjIter (myObjects); anObjIter.More(); anObjIter.Next())
  {
-    const Handle(AIS_InteractiveObject)& anObj = anObjIter.Key();
+    Handle(AIS_InteractiveObject) anObj = anObjIter.Key();
    if (anObj->Type() != theKOI)
    {
      continue;
@@ -1155,7 +1155,7 @@ void AIS_InteractiveContext::SetDisplayMode(const Standard_Integer theMode,
      continue;
    }

-    const Handle(AIS_GlobalStatus)& aStatus = anObjIter.Value();
+    Handle(AIS_GlobalStatus) aStatus = anObjIter.Value();
    aStatus->SetDisplayMode (theMode);

    if (anObj->DisplayStatus() == PrsMgr_DisplayStatus_Displayed)
@@ -2251,7 +2251,7 @@ Bnd_Box AIS_InteractiveContext::BoundingBoxOfSelection (const Handle(V3d_View)&

  for (AIS_MapIteratorOfMapOfObjectOwners anIter (anObjectOwnerMap); anIter.More(); anIter.Next())
  {
-    const Handle(SelectMgr_SelectableObject)& anObject = anIter.Key();
+    const Handle(SelectMgr_SelectableObject) anObject = anIter.Key();
    Bnd_Box aTmpBox = anObject->BndBoxOfSelected (anIter.ChangeValue());
    aBndSelected.Add (aTmpBox);
  }
@@ -3228,30 +3228,6 @@ void AIS_InteractiveContext::ClearSelected (const Standard_Boolean theToUpdateVi
  }
 }

-//=======================================================================
-//function : isDetected
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_InteractiveContext::isDetected (const Handle(AIS_InteractiveObject)& theObject)
-{
-  for (Standard_Integer aDetIter = myDetectedSeq.Lower(); aDetIter <= myDetectedSeq.Upper(); aDetIter++)
-  {
-    Handle(SelectMgr_EntityOwner) aPicked = MainSelector()->Picked(myDetectedSeq(aDetIter));
-    Handle(AIS_InteractiveObject) anObj;
-    if (!aPicked.IsNull())
-    {
-      anObj = Handle(AIS_InteractiveObject)::DownCast(aPicked->Selectable());
-    }
-
-    if (!anObj.IsNull()
-      && anObj == theObject)
-    {
-      return Standard_True;
-    }
-  }
-  return Standard_False;
-}
-
 //=======================================================================
 //function : SetSelected
 //purpose  : Sets the whole object as selected and highlights it with selection color
@@ -3312,8 +3288,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(AIS_InteractiveObject)& t
  }

  // added to avoid untimely viewer update...
-  const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
-  mySelection->ClearAndSelect (anOwner, myFilters, isDetected (anObj));
+  mySelection->ClearAndSelect (anOwner);

  if (myAutoHilight)
  {
@@ -3375,7 +3350,7 @@ void AIS_InteractiveContext::SetSelected (const Handle(SelectMgr_EntityOwner)& t
    unhighlightSelected();
  }

-  mySelection->ClearAndSelect (theOwner, myFilters, isDetected (anObject));
+  mySelection->ClearAndSelect (theOwner);
  if (myAutoHilight)
  {
    Handle(Prs3d_Drawer) aCustomStyle;
@@ -3426,17 +3401,16 @@ void AIS_InteractiveContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityO
    return;
  }

-  if (!myFilters->IsOk (theOwner) && !theOwner->IsSelected())
+  if (!myFilters->IsOk(theOwner) && !theOwner->IsSelected())
  {
    return;
  }

-  AIS_SelectionScheme aSelScheme = theOwner->IsSelected() ? AIS_SelectionScheme_Remove : AIS_SelectionScheme_Add;
-  const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable());
-  mySelection->Select (theOwner, myFilters, aSelScheme, isDetected (anObj));
+  mySelection->Select (theOwner);

  if (myAutoHilight)
  {
+    const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (theOwner->Selectable());
    Handle(AIS_GlobalStatus)* aStatusPtr = myObjects.ChangeSeek (anObj);
    if (!aStatusPtr)
    {
@@ -3495,8 +3469,7 @@ Standard_Boolean AIS_InteractiveContext::SetSelectedState (const Handle(SelectMg
  }
  else
  {
-    const Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast(theEntity->Selectable());
-    const AIS_SelectStatus aSelStatus = mySelection->Select (theEntity, myFilters, AIS_SelectionScheme_Remove, isDetected (anObj));
+    const AIS_SelectStatus aSelStatus = mySelection->Select (theEntity);
    theEntity->SetSelected (false);
    return aSelStatus == AIS_SS_Removed;
  }
--- a/src/AIS/AIS_InteractiveContext.hxx
+++ b/src/AIS/AIS_InteractiveContext.hxx
@@ -1302,9 +1302,6 @@ protected: //! @name internal methods
  Standard_EXPORT AIS_StatusOfDetection moveTo (const Handle(V3d_View)& theView,
                                                const Standard_Boolean  theToRedrawOnUpdate);

-  //! Returns True if the object is detected.
-  Standard_EXPORT Standard_Boolean isDetected (const Handle(AIS_InteractiveObject)& theObject);
-
  //! Helper function to unhighlight all entity owners currently highlighted with seleciton color.
  Standard_EXPORT void unselectOwners (const Handle(AIS_InteractiveObject)& theObject);

--- a/src/AIS/AIS_Manipulator.cxx
+++ b/src/AIS/AIS_Manipulator.cxx
@@ -1116,23 +1116,18 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
                                        const Standard_Integer theMode)
 {
  //Check mode
-  const AIS_ManipulatorMode aMode = (AIS_ManipulatorMode) theMode;
+  AIS_ManipulatorMode aMode = (AIS_ManipulatorMode) theMode;
  if (aMode == AIS_MM_None)
  {
    return;
  }
  Handle(SelectMgr_EntityOwner) anOwner;
-
-  // Sensitivity calculation for manipulator parts allows to avoid
-  // overlapping of sensitive areas when size of manipulator is small.
-  // Sensitivity is calculated relative to the default size of the manipulator (100.0f).
-  const Standard_ShortReal aSensitivityCoef = myAxes[0].Size() / 100.0f;
-  const Standard_Integer aHighSensitivity = Max (Min (RealToInt (aSensitivityCoef * 15), 15), 3); // clamp sensitivity within range [3, 15]
-  const Standard_Integer aLowSensitivity  = Max (Min (RealToInt (aSensitivityCoef * 10), 10), 2); // clamp sensitivity within range [2, 10]
-
-  switch (aMode)
+  if (aMode == AIS_MM_None)
  {
-  case AIS_MM_Translation:
+    anOwner = new SelectMgr_EntityOwner (this, 5);
+  }
+
+  if (aMode == AIS_MM_Translation || aMode == AIS_MM_None)
  {
    for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
    {
@@ -1141,21 +1136,23 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
        continue;
      }
      const Axis& anAxis = myAxes[anIt];
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_Translation, 9);
-
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner (this, anIt, AIS_MM_Translation, 9);
+      }
      // define sensitivity by line
-      Handle(Select3D_SensitiveSegment) aLine = new Select3D_SensitiveSegment(anOwner, gp::Origin(), anAxis.TranslatorTipPosition());
-      aLine->SetSensitivityFactor (aHighSensitivity);
+      Handle(Select3D_SensitiveSegment) aLine = new Select3D_SensitiveSegment (anOwner, gp::Origin(), anAxis.TranslatorTipPosition());
+      aLine->SetSensitivityFactor (15);
      theSelection->Add (aLine);

      // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitivePrimitiveArray) aTri = new Select3D_SensitivePrimitiveArray(anOwner);
+      Handle(Select3D_SensitivePrimitiveArray) aTri = new Select3D_SensitivePrimitiveArray (anOwner);
      aTri->InitTriangulation (anAxis.TriangleArray()->Attributes(), anAxis.TriangleArray()->Indices(), TopLoc_Location());
      theSelection->Add (aTri);
    }
-    break;
  }
-  case AIS_MM_Rotation:
+
+  if (aMode == AIS_MM_Rotation || aMode == AIS_MM_None)
  {
    for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
    {
@@ -1164,20 +1161,22 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
        continue;
      }
      const Axis& anAxis = myAxes[anIt];
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_Rotation, 9);
-
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner (this, anIt, AIS_MM_Rotation, 9);
+      }
      // define sensitivity by circle
-      const gp_Circ aGeomCircle (gp_Ax2(gp::Origin(), anAxis.ReferenceAxis().Direction()), anAxis.RotatorDiskRadius());
-      Handle(Select3D_SensitiveCircle) aCircle = new ManipSensCircle(anOwner, aGeomCircle);
-      aCircle->SetSensitivityFactor (aLowSensitivity);
-      theSelection->Add(aCircle);
+      const gp_Circ aGeomCircle (gp_Ax2 (gp::Origin(), anAxis.ReferenceAxis().Direction()), anAxis.RotatorDiskRadius());
+      Handle(Select3D_SensitiveCircle) aCircle = new ManipSensCircle (anOwner, aGeomCircle);
+      aCircle->SetSensitivityFactor (15);
+      theSelection->Add (aCircle);
      // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitiveTriangulation) aTri = new ManipSensTriangulation(anOwner, myAxes[anIt].RotatorDisk().Triangulation(), anAxis.ReferenceAxis().Direction());
+      Handle(Select3D_SensitiveTriangulation) aTri = new ManipSensTriangulation (anOwner, myAxes[anIt].RotatorDisk().Triangulation(), anAxis.ReferenceAxis().Direction());
      theSelection->Add (aTri);
    }
-    break;
  }
-  case AIS_MM_Scaling:
+
+  if (aMode == AIS_MM_Scaling || aMode == AIS_MM_None)
  {
    for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
    {
@@ -1185,19 +1184,21 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
      {
        continue;
      }
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_Scaling, 9);
-
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner (this, anIt, AIS_MM_Scaling, 9);
+      }
      // define sensitivity by point
-      Handle(Select3D_SensitivePoint) aPnt = new Select3D_SensitivePoint(anOwner, myAxes[anIt].ScalerCubePosition());
-      aPnt->SetSensitivityFactor (aHighSensitivity);
+      Handle(Select3D_SensitivePoint) aPnt = new Select3D_SensitivePoint (anOwner, myAxes[anIt].ScalerCubePosition());
+      aPnt->SetSensitivityFactor (15);
      theSelection->Add (aPnt);
      // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation(anOwner, myAxes[anIt].ScalerCube().Triangulation(), TopLoc_Location(), Standard_True);
+      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation (anOwner, myAxes[anIt].ScalerCube().Triangulation(), TopLoc_Location(), Standard_True);
      theSelection->Add (aTri);
    }
-    break;
  }
-  case AIS_MM_TranslationPlane:
+
+  if (aMode == AIS_MM_TranslationPlane || aMode == AIS_MM_None)
  {
    for (Standard_Integer anIt = 0; anIt < 3; ++anIt)
    {
@@ -1205,33 +1206,28 @@ void AIS_Manipulator::ComputeSelection (const Handle(SelectMgr_Selection)& theSe
      {
        continue;
      }
-      anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_TranslationPlane, 9);
+      if (aMode != AIS_MM_None)
+      {
+        anOwner = new AIS_ManipulatorOwner(this, anIt, AIS_MM_TranslationPlane, 9);
+      }

      // define sensitivity by two crossed lines
-      Standard_Real aSensitivityOffset = ZoomPersistence() ? aHighSensitivity * (0.5 + M_SQRT2) : 0.0;
-      gp_Pnt aP1 = myAxes[((anIt + 1) % 3)].TranslatorTipPosition().Translated (myAxes[((anIt + 2) % 3)].ReferenceAxis().Direction().XYZ() * aSensitivityOffset);
-      gp_Pnt aP2 = myAxes[((anIt + 2) % 3)].TranslatorTipPosition().Translated (myAxes[((anIt + 1) % 3)].ReferenceAxis().Direction().XYZ() * aSensitivityOffset);
+      gp_Pnt aP1, aP2;
+      aP1 = myAxes[((anIt + 1) % 3)].TranslatorTipPosition();
+      aP2 = myAxes[((anIt + 2) % 3)].TranslatorTipPosition();
      gp_XYZ aMidP = (aP1.XYZ() + aP2.XYZ()) / 2.0;
-      gp_XYZ anOrig = aMidP.Normalized().Multiplied (aSensitivityOffset);

      Handle(Select3D_SensitiveSegment) aLine1 = new Select3D_SensitiveSegment(anOwner, aP1, aP2);
-      aLine1->SetSensitivityFactor(aLowSensitivity);
-      theSelection->Add (aLine1);
-      Handle(Select3D_SensitiveSegment) aLine2 = new Select3D_SensitiveSegment(anOwner, anOrig, aMidP);
-      aLine2->SetSensitivityFactor (aLowSensitivity);
-      theSelection->Add (aLine2);
+      aLine1->SetSensitivityFactor(10);
+      theSelection->Add(aLine1);
+      Handle(Select3D_SensitiveSegment) aLine2 = new Select3D_SensitiveSegment(anOwner, gp::Origin(), aMidP);
+      aLine2->SetSensitivityFactor(10);
+      theSelection->Add(aLine2);

      // enlarge sensitivity by triangulation
-      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation(anOwner, myAxes[anIt].DraggerSector().Triangulation(), TopLoc_Location(), Standard_True); 
-      theSelection->Add (aTri);
+      Handle(Select3D_SensitiveTriangulation) aTri = new Select3D_SensitiveTriangulation(anOwner, myAxes[anIt].DraggerSector().Triangulation(), TopLoc_Location(), Standard_True);
+      theSelection->Add(aTri);
    }
-    break;
-  }
-  default:
-  {
-    anOwner = new SelectMgr_EntityOwner(this, 5);
-    break;
-  }
  }
 }

--- a/src/AIS/AIS_Selection.cxx
+++ b/src/AIS/AIS_Selection.cxx
@@ -55,38 +55,24 @@ void AIS_Selection::Clear()
 //function : Select
 //purpose  :
 //=======================================================================
-AIS_SelectStatus AIS_Selection::Select (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                        const Handle(SelectMgr_Filter)& theFilter,
-                                        const AIS_SelectionScheme theSelScheme,
-                                        const Standard_Boolean theIsDetected)
+AIS_SelectStatus AIS_Selection::Select (const Handle(SelectMgr_EntityOwner)& theObject)
 {
-  if (theOwner.IsNull()
-  || !theOwner->HasSelectable())
+  if (theObject.IsNull()
+  || !theObject->HasSelectable())
  {
    return AIS_SS_NotDone;
  }

-  const Standard_Boolean isDetected = theIsDetected
-                                   && (theFilter.IsNull() || theFilter->IsOk (theOwner));
-
-  const Standard_Boolean wasSelected = theOwner->IsSelected();
-  const Standard_Boolean toSelect = theOwner->Select (theSelScheme, isDetected);
-
-  if (toSelect && !wasSelected)
+  if (!myResultMap.IsBound (theObject))
  {
    AIS_NListOfEntityOwner::Iterator aListIter;
-    myresult.Append  (theOwner, aListIter);
-    myResultMap.Bind (theOwner, aListIter);
-    theOwner->SetSelected (Standard_True);
+    myresult.Append  (theObject, aListIter);
+    myResultMap.Bind (theObject, aListIter);
+    theObject->SetSelected (Standard_True);
    return AIS_SS_Added;
  }

-  if (!toSelect && !wasSelected)
-  {
-    return AIS_SS_NotDone;
-  }
-
-  AIS_NListOfEntityOwner::Iterator aListIter = myResultMap.Find (theOwner);
+  AIS_NListOfEntityOwner::Iterator aListIter = myResultMap.Find (theObject);
  if (myIterator == aListIter)
  {
    if (myIterator.More())
@@ -102,14 +88,14 @@ AIS_SelectStatus AIS_Selection::Select (const Handle(SelectMgr_EntityOwner)& the
  // In the mode of advanced mesh selection only one owner is created for all selection modes.
  // It is necessary to check the current detected entity
  // and remove the owner from map only if the detected entity is the same as previous selected (IsForcedHilight call)
-  if (theOwner->IsForcedHilight())
+  if (theObject->IsForcedHilight())
  {
    return AIS_SS_Added;
  }

  myresult.Remove (aListIter);
-  myResultMap.UnBind (theOwner);
-  theOwner->SetSelected (Standard_False);
+  myResultMap.UnBind (theObject);
+  theObject->SetSelected (Standard_False);

  // update list iterator for next object in <myresult> list if any
  if (aListIter.More())
@@ -156,39 +142,86 @@ void AIS_Selection::SelectOwners (const AIS_NArray1OfEntityOwner& thePickedOwner
                                  const Standard_Boolean theToAllowSelOverlap,
                                  const Handle(SelectMgr_Filter)& theFilter)
 {
-  (void)theToAllowSelOverlap;
-
-  if (theSelScheme == AIS_SelectionScheme_ReplaceExtra
-   && thePickedOwners.Size() == myresult.Size())
+  (void )theToAllowSelOverlap;
+  switch (theSelScheme)
  {
-    // If picked owners is equivalent to the selected then just clear selected.
-    Standard_Boolean isTheSame = Standard_True;
-    for (AIS_NArray1OfEntityOwner::Iterator aPickedIter (thePickedOwners); aPickedIter.More(); aPickedIter.Next())
+    case AIS_SelectionScheme_UNKNOWN:
    {
-      if (!myResultMap.IsBound (aPickedIter.Value()))
+      return;
+    }
+    case AIS_SelectionScheme_ReplaceExtra:
+    {
+      // If picked owners is equivalent to the selected then just clear selected
+      // Else go to AIS_SelectionScheme_Replace
+      if (thePickedOwners.Size() == myresult.Size())
      {
-        isTheSame = Standard_False;
-        break;
+        Standard_Boolean isTheSame = Standard_True;
+        for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+        {
+          if (!myResultMap.IsBound (aSelIter.Value()))
+          {
+            isTheSame = Standard_False;
+            break;
+          }
+        }
+        if (isTheSame)
+        {
+          Clear();
+          return;
+        }
      }
    }
-    if (isTheSame)
+    Standard_FALLTHROUGH
+    case AIS_SelectionScheme_Replace:
    {
-       Clear();
-       return;
+      Clear();
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        appendOwner (aSelIter.Value(), theFilter);
+      }
+
+      return;
    }
-  }
+    case AIS_SelectionScheme_Add:
+    {
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        appendOwner (aSelIter.Value(), theFilter);
+      }
+      return;
+    }
+    case AIS_SelectionScheme_Remove:
+    {
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        if (myResultMap.IsBound (aSelIter.Value()))
+        {
+          Select (aSelIter.Value());
+        }
+      }
+      return;
+    }
+    case AIS_SelectionScheme_XOR:
+    {
+      for (AIS_NArray1OfEntityOwner::Iterator aSelIter (thePickedOwners); aSelIter.More(); aSelIter.Next())
+      {
+        const Handle(SelectMgr_EntityOwner)& anOwner = aSelIter.Value();
+        if (anOwner.IsNull()
+        || !anOwner->HasSelectable()
+        || !theFilter->IsOk (anOwner))
+        {
+          continue;
+        }

-  if (theSelScheme == AIS_SelectionScheme_Replace
-   || theSelScheme == AIS_SelectionScheme_ReplaceExtra
-   || theSelScheme == AIS_SelectionScheme_Clear)
-  {
-    Clear();
-  }
-
-  for (AIS_NArray1OfEntityOwner::Iterator aPickedIter (thePickedOwners); aPickedIter.More(); aPickedIter.Next())
-  {
-    const Handle(SelectMgr_EntityOwner)& anOwner = aPickedIter.Value();
-    Select (anOwner, theFilter, theSelScheme, true);
+        Select (anOwner);
+      }
+      return;
+    }
+    case AIS_SelectionScheme_Clear:
+    {
+      Clear();
+      return;
+    }
  }
 }

--- a/src/AIS/AIS_Selection.hxx
+++ b/src/AIS/AIS_Selection.hxx
@@ -34,36 +34,23 @@ public:

  //! creates a new selection.
  Standard_EXPORT AIS_Selection();
-
+  
  //! removes all the object of the selection.
  Standard_EXPORT virtual void Clear();
-
+  
  //! if the object is not yet in the selection, it will be added.
  //! if the object is already in the selection, it will be removed.
-  //! @param[in] theOwner element to change selection state
-  //! @param[in] theFilter context filter
-  //! @param[in] theSelScheme selection scheme
-  //! @param[in] theIsDetected flag of object detection
-  //! @return result of selection
-  Standard_EXPORT virtual AIS_SelectStatus Select (const Handle(SelectMgr_EntityOwner)& theOwner,
-                                                   const Handle(SelectMgr_Filter)& theFilter,
-                                                   const AIS_SelectionScheme theSelScheme,
-                                                   const Standard_Boolean theIsDetected);
-
+  Standard_EXPORT virtual AIS_SelectStatus Select (const Handle(SelectMgr_EntityOwner)& theObject);
+  
  //! the object is always add int the selection.
  //! faster when the number of objects selected is great.
  Standard_EXPORT virtual AIS_SelectStatus AddSelect (const Handle(SelectMgr_EntityOwner)& theObject);

  //! clears the selection and adds the object in the selection.
-  //! @param[in] theObject element to change selection state
-  //! @param[in] theFilter context filter
-  //! @param[in] theIsDetected flag of object detection
-  virtual void ClearAndSelect (const Handle(SelectMgr_EntityOwner)& theObject,
-                               const Handle(SelectMgr_Filter)& theFilter,
-                               const Standard_Boolean theIsDetected)
+  virtual void ClearAndSelect (const Handle(SelectMgr_EntityOwner)& theObject)
  {
    Clear();
-    Select (theObject, theFilter, AIS_SelectionScheme_Add, theIsDetected);
+    Select (theObject);
  }

  //! checks if the object is in the selection.
--- a/src/AIS/FILES
+++ b/src/AIS/FILES
@@ -2,8 +2,6 @@ AIS.hxx
 AIS_Animation.cxx
 AIS_Animation.hxx
 AIS_AnimationTimer.hxx
-AIS_AnimationAxisRotation.cxx
-AIS_AnimationAxisRotation.hxx
 AIS_AnimationCamera.cxx
 AIS_AnimationCamera.hxx
 AIS_AnimationObject.cxx
@@ -14,8 +12,6 @@ AIS_Axis.cxx
 AIS_Axis.hxx
 AIS_BadEdgeFilter.cxx
 AIS_BadEdgeFilter.hxx
-AIS_BaseAnimationObject.cxx
-AIS_BaseAnimationObject.hxx
 AIS_C0RegularityFilter.cxx
 AIS_C0RegularityFilter.hxx
 AIS_CameraFrustum.cxx
--- a/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
+++ b/src/AdvApp2Var/AdvApp2Var_SysBase.cxx
@@ -911,9 +911,10 @@ int macrmsg_(const char *,//crout,
    /* Parameter adjustments */
  ct -= ct_len;
  (void )ct; // unused
-  (void )xt; // unused
-  (void )it; // unused

+  --xt;
+  --it;
+  
  /* Function Body */
  mamdlng_(cln, 3L);
  
@@ -1788,7 +1789,7 @@ int maoverf_(integer *nbentr,
    /* Loop. The upper limit is the integer value of the logarithm of base 2
     */
    /* of NBENTR/NLONGR. */
-    i__1 = (integer) (std::log((real) (*nbentr) / (float)63.) / std::log((float)2.))
+    i__1 = (integer) (log((real) (*nbentr) / (float)63.) / log((float)2.))
      ;
    for (ibid = 1; ibid <= i__1; ++ibid) {
      
--- a/src/Approx/Approx_CurveOnSurface.cxx
+++ b/src/Approx/Approx_CurveOnSurface.cxx
@@ -556,7 +556,7 @@ void Approx_CurveOnSurface::Perform(const Standard_Integer theMaxSegments,
 //function : isIsoLine
 //purpose  :
 //=============================================================================
-Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                                                  Standard_Boolean&                theIsU,
                                                  Standard_Real&                   theParam,
                                                  Standard_Boolean&                theIsForward) const
@@ -638,7 +638,7 @@ Standard_Boolean Approx_CurveOnSurface::isIsoLine(const Handle(Adaptor2d_Curve2d
 //function : buildC3dOnIsoLine
 //purpose  :
 //=============================================================================
-Standard_Boolean Approx_CurveOnSurface::buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+Standard_Boolean Approx_CurveOnSurface::buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                                                          const Standard_Boolean           theIsU,
                                                          const Standard_Real              theParam,
                                                          const Standard_Boolean           theIsForward)
--- a/src/Approx/Approx_CurveOnSurface.hxx
+++ b/src/Approx/Approx_CurveOnSurface.hxx
@@ -85,7 +85,7 @@ protected:
  //! @param theParam     Line parameter.
  //! @param theIsForward Flag indicating forward parameterization on a isoline.
  //! @return Standard_True when 2d curve is a line and Standard_False otherwise.
-  Standard_Boolean isIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+  Standard_Boolean isIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                             Standard_Boolean&                theIsU,
                             Standard_Real&                   theParam,
                             Standard_Boolean&                theIsForward) const;
@@ -97,7 +97,7 @@ protected:
  //! @param theParam Line parameter.
  //! @param theIsForward Flag indicating forward parameterization on a isoline.
  //! @return Standard_True when 3d curve is built and Standard_False otherwise.
-  Standard_Boolean buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d)& theC2D,
+  Standard_Boolean buildC3dOnIsoLine(const Handle(Adaptor2d_Curve2d) theC2D,
                                     const Standard_Boolean           theIsU,
                                     const Standard_Real              theParam,
                                     const Standard_Boolean           theIsForward);
--- a/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
+++ b/src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
@@ -733,7 +733,7 @@ void MakeInternalShells(const TopTools_IndexedMapOfShape& theMF,
  //
  aNbF = theMF.Extent();
  for (i = 1; i <= aNbF; ++i) {
-    const TopoDS_Shape& aF = theMF(i);
+    TopoDS_Shape aF = theMF(i);
    TopExp::MapShapesAndAncestors(aF, 
        TopAbs_EDGE, TopAbs_FACE, 
        aMEF);
--- a/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
+++ b/src/BOPAlgo/BOPAlgo_PaveFiller_6.cxx
@@ -62,7 +62,6 @@
 #include <IntTools_SequenceOfCurves.hxx>
 #include <IntTools_SequenceOfPntOn2Faces.hxx>
 #include <IntTools_Tools.hxx>
-#include <NCollection_IncAllocator.hxx>
 #include <NCollection_Vector.hxx>
 #include <Precision.hxx>
 #include <TColStd_ListOfInteger.hxx>
@@ -579,12 +578,14 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
  Standard_Integer i, nF1, nF2, aNbC, aNbP, j;
  Standard_Integer nV1, nV2;
  Standard_Real aT1, aT2;
-  Handle(NCollection_BaseAllocator) aAllocator = new NCollection_IncAllocator;
+  Handle(NCollection_BaseAllocator) aAllocator;
  BOPDS_ListIteratorOfListOfPaveBlock aItLPB;
  TopoDS_Edge aES;
  Handle(BOPDS_PaveBlock) aPBOut;
  //
  //-----------------------------------------------------scope f
+  aAllocator=
+    NCollection_BaseAllocator::CommonBaseAllocator();
  //
  TColStd_ListOfInteger aLSE(aAllocator), aLBV(aAllocator);
  TColStd_MapOfInteger aMVOnIn(100, aAllocator), aMVCommon(100, aAllocator),
@@ -606,23 +607,13 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
  // Map of PaveBlocks with the faces to which it has to be added
  BOPAlgo_DataMapOfPaveBlockListOfInteger aPBFacesMap;
  //
-  // The vector aFFToRecheck contains indices of potentially problematic Face-Face intersections
-  NCollection_Vector<Standard_Integer> aFFToRecheck;
-  // aNbFF may be increased while processing this loop, because it is necessary to recheck 
-  // some of Face-Face intersections to avoid missing section edges
-  // aNbFF will be increased to the number of potentially problematic Face-Face intersections
-  const Standard_Integer aNbFFPrev = aNbFF;
-  for (i = 0; i < aNbFF; ++i, aPS.Next()) 
-  {
+  for (i=0; i<aNbFF; ++i, aPS.Next()) {
    if (UserBreak(aPS))
    {
      return;
    }
-    // after passing through all of Face-Face intersections it is necessary to return
-    // to potentially problematic Face-Face intersections and process them one more time
-    const Standard_Integer aCurInd = i < aNbFFPrev ? i : aFFToRecheck[i - aNbFFPrev];
    //
-    BOPDS_InterfFF& aFF=aFFs(aCurInd);
+    BOPDS_InterfFF& aFF=aFFs(i);
    aFF.Indices(nF1, nF2);
    //
    BOPDS_VectorOfPoint& aVP=aFF.ChangePoints();
@@ -745,9 +736,6 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
      }
    }

-    // Added additional check of Face-Face intersection to avoid missing section edges
-    // because of sequence of Face-Face interference processing 
-    Standard_Boolean isToRecheck = aNbC > 0 && i < aNbFFPrev;
    //
    // 3. Make section edges
    for (j=0; j<aNbC; ++j) {
@@ -761,11 +749,6 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
      aLPB.Clear();
      aPB1->Update(aLPB, Standard_False);
      //
-      if (aLPB.Extent() != 0)
-      {
-        isToRecheck = false;
-      }
-
      aItLPB.Initialize(aLPB);
      for (; aItLPB.More(); aItLPB.Next()) {
        Handle(BOPDS_PaveBlock)& aPB=aItLPB.ChangeValue();
@@ -867,7 +850,7 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
            if (aMPBAdd.Add(aPBOut))
            {
              // Add edge for processing as the section edge
-              PreparePostTreatFF(aCurInd, j, aPBOut, aMSCPB, aMVI, aLPBC);
+              PreparePostTreatFF(i, j, aPBOut, aMSCPB, aMVI, aLPBC);
            }
          }
          continue;
@@ -886,7 +869,7 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
        //
        // Keep info for post treatment 
        BOPDS_CoupleOfPaveBlocks aCPB;
-        aCPB.SetIndexInterf(aCurInd);
+        aCPB.SetIndexInterf(i);
        aCPB.SetIndex(j);
        aCPB.SetPaveBlock1(aPB);
        //
@@ -898,17 +881,12 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
        aMVTol.UnBind(nV2);

        // Add existing pave blocks for post treatment
-        ProcessExistingPaveBlocks (aCurInd, j, nF1, nF2, aES, aMPBOnIn, aPBTree,
+        ProcessExistingPaveBlocks (i, j, nF1, nF2, aES, aMPBOnIn, aPBTree,
                                   aMSCPB, aMVI, aLPBC, aPBFacesMap, aMPBAdd);
      }
      //
      aLPBC.RemoveFirst();
    }//for (j=0; j<aNbC; ++j) {
-    if (isToRecheck)
-    {
-      aFFToRecheck.Append(aCurInd);
-      ++aNbFF;
-    }
    //
    //back to previous tolerance values for unused vertices
    //and forget about SD groups of such vertices
@@ -932,7 +910,7 @@ void BOPAlgo_PaveFiller::MakeBlocks(const Message_ProgressRange& theRange)
        aDMVLV.UnBind(nV1);
    }
    //
-    ProcessExistingPaveBlocks(aCurInd, nF1, nF2, aMPBOnIn, aPBTree, aDMBV, aMSCPB, aMVI, aPBFacesMap, aMPBAdd);
+    ProcessExistingPaveBlocks(i, nF1, nF2, aMPBOnIn, aPBTree, aDMBV, aMSCPB, aMVI, aPBFacesMap, aMPBAdd);
  }//for (i=0; i<aNbFF; ++i) {

  // Remove "micro" section edges
--- a/src/BOPAlgo/BOPAlgo_ShellSplitter.cxx
+++ b/src/BOPAlgo/BOPAlgo_ShellSplitter.cxx
@@ -248,178 +248,167 @@ void BOPAlgo_ShellSplitter::SplitBlock(BOPTools_ConnexityBlock& aCB)
  //
  // Build the shells
  aItF.Initialize (aLFConnected);
-  for (i = 1; aItF.More() && !bAllFacesTaken; aItF.Next(), ++i)
-  {
+  for (i = 1; aItF.More() && !bAllFacesTaken; aItF.Next(), ++i) {
    const TopoDS_Shape& aFF = aItF.Value();
    if (!AddedFacesMap.Add(aFF)) {
      continue;
    }
    //
    // make a new shell
-    TopoDS_Shell aShell;
-    aBB.MakeShell(aShell);
-    aBB.Add(aShell, aFF);
-
-    aMEFP.Clear();
-    TopExp::MapShapesAndAncestors(aShell, TopAbs_EDGE, TopAbs_FACE, aMEFP);
+    TopoDS_Shell aShellStart;
+    aBB.MakeShell(aShellStart);
+    aBB.Add(aShellStart, aFF);
    //
-    // loop on faces added to Shell; 
-    // add their neighbor faces to Shell and so on
-    aItS.Initialize(aShell);
-    for (; aItS.More(); aItS.Next()) {
-      const TopoDS_Face& aF = (*(TopoDS_Face*)(&aItS.Value()));
-      Standard_Boolean isBoundary = aBoundaryFaces.Contains (aF);
+    TopTools_ListOfShape aLShells;
+    aLShells.Append(aShellStart);
+    //
+    TopTools_ListIteratorOfListOfShape aItLShells(aLShells);
+    for (; aItLShells.More(); aItLShells.Next()) {
+      TopoDS_Shell& aShell = TopoDS::Shell(aItLShells.ChangeValue());
      //
-      // loop on edges of aF; find a good neighbor face of aF by aE
-      aExp.Init(aF, TopAbs_EDGE);
-      for (; aExp.More(); aExp.Next()) {
-        const TopoDS_Edge& aE = (*(TopoDS_Edge*)(&aExp.Current()));
+      aMEFP.Clear();
+      TopExp::MapShapesAndAncestors(aShell, TopAbs_EDGE, TopAbs_FACE, aMEFP);
+      //
+      // loop on faces added to Shell; 
+      // add their neighbor faces to Shell and so on
+      aItS.Initialize(aShell);
+      for (; aItS.More(); aItS.Next()) {
+        const TopoDS_Face& aF = (*(TopoDS_Face*)(&aItS.Value()));
+        Standard_Boolean isBoundary = aBoundaryFaces.Contains (aF);
        //
-        // proceed only free edges in this shell
-        if (aMEFP.Contains(aE)) {
-          const TopTools_ListOfShape& aLFP = aMEFP.FindFromKey(aE);
-          aNbFP = aLFP.Extent();
-          if (aNbFP > 1) {
+        // loop on edges of aF; find a good neighbor face of aF by aE
+        aExp.Init(aF, TopAbs_EDGE);
+        for (; aExp.More(); aExp.Next()) {
+          const TopoDS_Edge& aE = (*(TopoDS_Edge*)(&aExp.Current()));
+          //
+          // proceed only free edges in this shell
+          if (aMEFP.Contains(aE)) {
+            const TopTools_ListOfShape& aLFP = aMEFP.FindFromKey(aE);
+            aNbFP = aLFP.Extent();
+            if (aNbFP > 1) {
+              continue;
+            }
+          }
+          // avoid processing of internal edges
+          anOr = aE.Orientation();
+          if (anOr == TopAbs_INTERNAL) {
            continue;
          }
-        }
-        // avoid processing of internal edges
-        anOr = aE.Orientation();
-        if (anOr == TopAbs_INTERNAL) {
-          continue;
-        }
-        // avoid processing of degenerated edges
-        if (BRep_Tool::Degenerated(aE)) {
-          continue;
-        }
-        //
-        // candidate faces list
-        const TopTools_ListOfShape& aLF = aEFMap.FindFromKey(aE);
-        aNbLF = aLF.Extent();
-        if (!aNbLF) {
-          continue;
-        }
-        //
-        // prepare for selecting the next face
-        // take only not-processed faces as a candidates
-        BOPTools_ListOfCoupleOfShape aLCSOff;
-        //
-        Standard_Integer aNbWaysInside = 0;
-        TopoDS_Face aSelF;
-        TopTools_ListIteratorOfListOfShape aItLF(aLF);
-        for (; aItLF.More(); aItLF.Next()) {
-          const TopoDS_Face& aFL = (*(TopoDS_Face*)(&aItLF.Value()));
-          if (aF.IsSame(aFL) || AddedFacesMap.Contains(aFL)) {
+          // avoid processing of degenerated edges
+          if (BRep_Tool::Degenerated(aE)) {
            continue;
          }
          //
-          // find current edge in the face
-          if (!BOPTools_AlgoTools::GetEdgeOff(aE, aFL, aEL)) {
+          // candidate faces list
+          const TopTools_ListOfShape& aLF = aEFMap.FindFromKey(aE);
+          aNbLF = aLF.Extent();
+          if (!aNbLF) {
            continue;
          }
          //
-          if (isBoundary && !aBoundaryFaces.Contains (aFL))
+          // prepare for selecting the next face
+          // take only not-processed faces as a candidates
+          BOPTools_ListOfCoupleOfShape aLCSOff;
+          //
+          Standard_Integer aNbWaysInside = 0;
+          TopoDS_Face aSelF;
+          TopTools_ListIteratorOfListOfShape aItLF(aLF);
+          for (; aItLF.More(); aItLF.Next()) {
+            const TopoDS_Face& aFL = (*(TopoDS_Face*)(&aItLF.Value()));
+            if (aF.IsSame(aFL) || AddedFacesMap.Contains(aFL)) {
+              continue;
+            }
+            //
+            // find current edge in the face
+            if (!BOPTools_AlgoTools::GetEdgeOff(aE, aFL, aEL)) {
+              continue;
+            }
+            //
+            if (isBoundary && !aBoundaryFaces.Contains (aFL))
+            {
+              ++aNbWaysInside;
+              aSelF = aFL;
+            }
+            aCSOff.SetShape1(aEL);
+            aCSOff.SetShape2(aFL);
+            aLCSOff.Append(aCSOff);
+          }//for (; aItLF.More(); aItLF.Next()) { 
+          //
+          aNbOff = aLCSOff.Extent();
+          if (!aNbOff){
+            continue;
+          }
+          //
+          // among all the adjacent faces chose one with the minimal
+          // angle to the current one
+          if (!isBoundary || aNbWaysInside != 1)
          {
-            ++aNbWaysInside;
-            aSelF = aFL;
+            if (aNbOff == 1) {
+              aSelF = (*(TopoDS_Face*)(&aLCSOff.First().Shape2()));
+            }
+            else if (aNbOff > 1) {
+              BOPTools_AlgoTools::GetFaceOff(aE, aF, aLCSOff, aSelF, aContext);
+            }
          }
-          aCSOff.SetShape1(aEL);
-          aCSOff.SetShape2(aFL);
-          aLCSOff.Append(aCSOff);
-        }//for (; aItLF.More(); aItLF.Next()) { 
-        //
-        aNbOff = aLCSOff.Extent();
-        if (!aNbOff){
-          continue;
-        }
-        //
-        // among all the adjacent faces chose one with the minimal
-        // angle to the current one
-        if (!isBoundary || aNbWaysInside != 1)
-        {
-          if (aNbOff == 1) {
-            aSelF = (*(TopoDS_Face*)(&aLCSOff.First().Shape2()));
+          //
+          if (!aSelF.IsNull() && AddedFacesMap.Add(aSelF)) {
+            aBB.Add(aShell, aSelF);
+            TopExp::MapShapesAndAncestors(aSelF, TopAbs_EDGE, TopAbs_FACE, aMEFP);
          }
-          else if (aNbOff > 1) {
-            BOPTools_AlgoTools::GetFaceOff(aE, aF, aLCSOff, aSelF, aContext);
-          }
-        }
-        //
-        if (!aSelF.IsNull() && AddedFacesMap.Add(aSelF)) {
-          aBB.Add(aShell, aSelF);
-          TopExp::MapShapesAndAncestors(aSelF, TopAbs_EDGE, TopAbs_FACE, aMEFP);
-        }
-      } // for (; aExp.More(); aExp.Next()) {
-    } // for (; aItS.More(); aItS.Next()) {
-    //
-    // split the shell on multi-connected edges
-    TopTools_ListOfShape aLShSp;
-    RefineShell(aShell, aMEFP, aLShSp);
-    //
-    // collect the not closed shells for further processing
-    TopTools_ListOfShape aLShNC;
-    //
-    TopTools_ListIteratorOfListOfShape aItLShSp(aLShSp);
-    for (; aItLShSp.More(); aItLShSp.Next()) {
-      TopoDS_Shell& aShSp = *((TopoDS_Shell*)&aItLShSp.Value());
+        } // for (; aExp.More(); aExp.Next()) {
+      } // for (; aItS.More(); aItS.Next()) {
      //
-      if (BRep_Tool::IsClosed(aShSp)) {
-        aShSp.Closed(Standard_True);
-        myLoops.Append(aShSp);
+      // split the shell on multi-connected edges
+      TopTools_ListOfShape aLShSp;
+      RefineShell(aShell, aMEFP, aLShSp);
+      //
+      // collect the not closed shells for further processing
+      TopTools_ListOfShape aLShNC;
+      //
+      TopTools_ListIteratorOfListOfShape aItLShSp(aLShSp);
+      for (; aItLShSp.More(); aItLShSp.Next()) {
+        TopoDS_Shell& aShSp = *((TopoDS_Shell*)&aItLShSp.Value());
+        //
+        if (BRep_Tool::IsClosed(aShSp)) {
+          aShSp.Closed(Standard_True);
+          myLoops.Append(aShSp);
+        }
+        else {
+          aLShNC.Append(aShSp);
+        }
      }
-      else {
-        aLShNC.Append(aShSp);
+      //
+      bAllFacesTaken = (AddedFacesMap.Extent() == aNbShapes);
+      if (bAllFacesTaken) {
+        break;
      }
-    }
-    //
-    bAllFacesTaken = (AddedFacesMap.Extent() == aNbShapes);
-    if (bAllFacesTaken) {
-      break;
-    }
-    //
-    if (aLShSp.Extent() == 1) {
-      // not further processing of not closed shells is needed,
-      // as it will not bring any new results
-      continue;
-    }
-    //
-    
-    // remove th faces of not closed shells from the map of processed faces
-    // and try to rebuild the shells using all not processed faces,
-    // because faces of one shell might be needed for building the other
-    TopTools_ListIteratorOfListOfShape aItLShNC(aLShNC);
-    for (; aItLShNC.More(); aItLShNC.Next()) 
-    {
-      TopoDS_Iterator aItNC(aItLShNC.Value());
-      for (; aItNC.More(); aItNC.Next()) 
-      {
-        AddedFacesMap.Remove(aItNC.Value());
+      //
+      if (aLShSp.Extent() == 1) {
+        // not further processing of not closed shells is needed,
+        // as it will not bring any new results
+        continue;
+      }
+      //
+      Standard_Integer aNbShNC = aLShNC.Extent();
+      if (aNbShNC == 1) {
+        // try to complete the shell with other faces
+        aLShells.Append(aLShNC);
+      }
+      else if (aNbShNC > 1) {
+        // remove th faces of not closed shells from the map of processed faces
+        // and try to rebuild the shells using all not processed faces,
+        // because faces of one shell might be needed for building the other
+        TopTools_ListIteratorOfListOfShape aItLShNC(aLShNC);
+        for (; aItLShNC.More(); aItLShNC.Next()) {
+          TopoDS_Iterator aItNC(aItLShNC.Value());
+          for (; aItNC.More(); aItNC.Next()) {
+            AddedFacesMap.Remove(aItNC.Value());
+          }
+        }
      }
    }
  } // for (; aItF.More(); aItF.Next()) {
 }
-
-//=======================================================================
-//function : FindShape
-//purpose  : 
-//=======================================================================
-TopoDS_Shape FindShape (const TopoDS_Shape& theShapeToFind,
-                        const TopoDS_Shape& theShape)
-{
-  TopoDS_Shape aRes;
-  TopExp_Explorer anExp(theShape, theShapeToFind.ShapeType());
-  for (; anExp.More(); anExp.Next())
-  {
-    const TopoDS_Shape& aShape = anExp.Current();
-    if (aShape.IsSame(theShapeToFind))
-    {
-      aRes = aShape;
-      break;
-    }
-  }
-  return aRes;
-}
-
 //=======================================================================
 //function : RefineShell
 //purpose  : 
@@ -445,21 +434,6 @@ void RefineShell(TopoDS_Shell& theShell,
      aMEStop.Add(aE);
      continue;
    }
-
-    if (aLF.Extent() == 2)
-    {
-      const TopoDS_Face& aF1 = TopoDS::Face(aLF.First());
-      const TopoDS_Face& aF2 = TopoDS::Face(aLF.Last());
-
-      TopoDS_Shape aE1 = FindShape(aE, aF1);
-      TopoDS_Shape aE2 = FindShape(aE, aF2);
-
-      if (aE1.Orientation() == aE2.Orientation())
-      {
-        aMEStop.Add(aE);
-        continue;
-      }
-    }
    //
    // check for internal edges - count faces, in which the edge
    // is internal, twice
--- a/src/BOPAlgo/BOPAlgo_WireSplitter_1.cxx
+++ b/src/BOPAlgo/BOPAlgo_WireSplitter_1.cxx
@@ -512,6 +512,7 @@ void Path (const GeomAdaptor_Surface& aGAS,
    Standard_Integer aNbWaysInside = 0;
    BOPAlgo_EdgeInfo *pOnlyWayIn = NULL;

+    Standard_Integer aCurIndexE = 0;
    anIt.Initialize(aLEInfo);
    for (; anIt.More(); anIt.Next()) {
      BOPAlgo_EdgeInfo& anEI=anIt.ChangeValue();
@@ -520,6 +521,7 @@ void Path (const GeomAdaptor_Surface& aGAS,
      anIsNotPassed=!anEI.Passed();
      //
      if (anIsOut && anIsNotPassed) {
+        aCurIndexE++;
        //
        // Is there one way to go out of the vertex 
        // we have to use it only.
--- a/src/BOPTest/BOPTest_BOPCommands.cxx
+++ b/src/BOPTest/BOPTest_BOPCommands.cxx
@@ -667,7 +667,7 @@ Standard_Integer bopcurves (Draw_Interpretor& di,
    for (Standard_Integer i=1; i<=aNbCurves; i++) {
      const IntTools_Curve& anIC=aSCs(i);

-      const Handle (Geom_Curve)&  aC3D = anIC.Curve();
+      Handle (Geom_Curve)  aC3D = anIC.Curve();

      if (aC3D.IsNull()) {
        di << " has Null 3d curve# " << i << "\n";
@@ -682,8 +682,8 @@ Standard_Integer bopcurves (Draw_Interpretor& di,
      DrawTrSurf::Set(nameC, aC3D);
      di << nameC << " ";
      //
-      const Handle(Geom2d_Curve)& aPC1 = anIC.FirstCurve2d();
-      const Handle(Geom2d_Curve)& aPC2 = anIC.SecondCurve2d();
+      Handle(Geom2d_Curve) aPC1 = anIC.FirstCurve2d();
+      Handle(Geom2d_Curve) aPC2 = anIC.SecondCurve2d();
      //
      if (!aPC1.IsNull() || !aPC2.IsNull()) {
        di << "(";
--- a/src/BOPTools/BOPTools_AlgoTools3D.cxx
+++ b/src/BOPTools/BOPTools_AlgoTools3D.cxx
@@ -736,7 +736,7 @@ void Add(const TopoDS_Shape& aS,
    return;
  }
  //
-  const TopoDS_Shape& aSx = aS;
+  TopoDS_Shape aSx = aS;
  //
  anIndex=myShapes.FindIndex(aSx);
  if (!anIndex) {
--- a/src/BOPTools/BOPTools_AlgoTools_2.cxx
+++ b/src/BOPTools/BOPTools_AlgoTools_2.cxx
@@ -112,7 +112,7 @@ void BOPTools_AlgoTools::MakeSectEdge(const IntTools_Curve& aIC,
                                      const Standard_Real  aP2,
                                      TopoDS_Edge& aNewEdge)
 {
-  const Handle(Geom_Curve)& aC=aIC.Curve ();
+  Handle(Geom_Curve) aC=aIC.Curve ();
  
  BRepBuilderAPI_MakeEdge aMakeEdge(aC, aV1, aV2, aP1, aP2);
  
--- a/src/BOPTools/BOPTools_PairSelector.hxx
+++ b/src/BOPTools/BOPTools_PairSelector.hxx
@@ -60,7 +60,7 @@ public: //! @name public interfaces
  //! Clears the indices
  void Clear()
  {
-    myPairs.clear();
+    myPairs.Clear();
  }

  //! Sorts the indices
--- a/src/BRepAlgo/BRepAlgo.cxx
+++ b/src/BRepAlgo/BRepAlgo.cxx
@@ -383,7 +383,7 @@ TopoDS_Edge  BRepAlgo::ConcatenateWireC0(const TopoDS_Wire& aWire)
  BRepTools_WireExplorer wexp(theWire);

  for (; wexp.More(); wexp.Next()) {
-    const TopoDS_Edge& anEdge = wexp.Current();
+    TopoDS_Edge anEdge = wexp.Current();
    Standard_Real fpar, lpar;
    Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, fpar, lpar);

@@ -392,7 +392,7 @@ TopoDS_Edge  BRepAlgo::ConcatenateWireC0(const TopoDS_Wire& aWire)

    GeomAdaptor_Curve  aGACurve(aCurve);
    GeomAbs_CurveType  aType       = aGACurve.GetType();
-    const Handle(Geom_Curve)& aBasisCurve = aGACurve.Curve();
+    Handle(Geom_Curve) aBasisCurve = aGACurve.Curve();
    Standard_Boolean   isFwd       = (wexp.Orientation() != TopAbs_REVERSED);

    if (aBasisCurve->IsPeriodic()) {
--- a/src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx
+++ b/src/BRepAlgo/BRepAlgo_FaceRestrictor.cxx
@@ -401,9 +401,12 @@ void BRepAlgo_FaceRestrictor::PerformWithCorrection()
  //---------------------------------------------------------
  // Classification of wires ones compared to the others.
  //---------------------------------------------------------
+  Standard_Integer j,i = 1;
+
  for (it.Initialize(wires) ; it.More(); it.Next()) {
    TopoDS_Wire& W1  = TopoDS::Wire(it.Value());
-    TopTools_ListIteratorOfListOfShape it2(wires);
+    TopTools_ListIteratorOfListOfShape it2(wires);  
+    j = 1;    

    if (IsClosed(W1)) {
      TopoDS_Shape aLocalShape = myFace.EmptyCopied();
@@ -419,8 +422,10 @@ void BRepAlgo_FaceRestrictor::PerformWithCorrection()
          Store (W2,W1,keyIsIn,keyContains);
        } 
        it2.Next();
+        j++;
      }
    }
+    i++;
  }
  TopTools_ListOfShape WireExt;
  
--- a/src/BRepAlgo/BRepAlgo_Loop.cxx
+++ b/src/BRepAlgo/BRepAlgo_Loop.cxx
@@ -42,14 +42,12 @@
 #include <TopTools_SequenceOfShape.hxx>

 #include <stdio.h>
-//#define OCCT_DEBUG_ALGO
-//#define DRAW
 #ifdef DRAW
 #include <DBRep.hxx>
 #pragma comment(lib,"TKDraw")
 #endif
 #ifdef OCCT_DEBUG_ALGO
-Standard_Boolean AffichLoop  = Standard_True;
+Standard_Boolean AffichLoop  = Standard_False;
 Standard_Integer NbLoops     = 0;
 Standard_Integer NbWires     = 1;
 static char* name = new char[100];
@@ -60,8 +58,7 @@ static char* name = new char[100];
 //purpose  : 
 //=======================================================================

-BRepAlgo_Loop::BRepAlgo_Loop():
-  myTolConf (0.001)
+BRepAlgo_Loop::BRepAlgo_Loop()
 {
 }

@@ -188,6 +185,7 @@ static TopoDS_Vertex  UpdateClosedEdge(const TopoDS_Edge&         E,
  Standard_Boolean OnStart = 0, OnEnd = 0;
  //// modified by jgv, 13.04.04 for OCC5634 ////
  TopExp::Vertices (E,V1,V2);
+  //Standard_Real    Tol = Precision::Confusion();
  Standard_Real    Tol = BRep_Tool::Tolerance( V1 );
  ///////////////////////////////////////////////
  
@@ -284,7 +282,7 @@ static void RemovePendingEdges(TopTools_IndexedDataMapOfShapeListOfShape& MVE)
 //purpose  : 
 //=======================================================================

-static Standard_Boolean  SamePnt2d(const TopoDS_Vertex&  V,
+static Standard_Boolean  SamePnt2d(TopoDS_Vertex  V,
 				   TopoDS_Edge&   E1,
 				   TopoDS_Edge&   E2,
 				   TopoDS_Face&   F)
@@ -429,12 +427,13 @@ static void StoreInMVE (const TopoDS_Face&                  F,
 			TopoDS_Edge&                  E,
 			TopTools_IndexedDataMapOfShapeListOfShape& MVE,
 			Standard_Boolean&                   YaCouture,
-			TopTools_DataMapOfShapeShape& VerticesForSubstitute,
-            const Standard_Real theTolConf)
+			TopTools_DataMapOfShapeShape& VerticesForSubstitute )
 {      
  TopoDS_Vertex V1, V2, V;
  TopTools_ListOfShape Empty;
  
+  Standard_Real Tol = 0.001; //5.e-05; //5.e-07;
+//  gp_Pnt P1, P2, P;
  gp_Pnt P1, P;
  BRep_Builder BB;
  for (Standard_Integer iV = 1; iV <= MVE.Extent(); iV++)
@@ -450,7 +449,7 @@ static void StoreInMVE (const TopoDS_Face&                  F,
 	{
 	  V1 = TopoDS::Vertex( itl.Value() );
 	  P1 = BRep_Tool::Pnt( V1 );
-	  if (P.IsEqual( P1, theTolConf ) && !V.IsSame(V1))
+	  if (P.IsEqual( P1, Tol ) && !V.IsSame(V1))
 	    {
 	      V.Orientation( V1.Orientation() );
 	      if (VerticesForSubstitute.IsBound( V1 ))
@@ -575,7 +574,7 @@ void BRepAlgo_Loop::Perform()
        TopoDS_Edge& E = TopoDS::Edge(itl1.Value());
        if (!Emap.Add(E))
          continue;
-        StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute, myTolConf);
+        StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute);
      }
    }
  }
@@ -587,7 +586,7 @@ void BRepAlgo_Loop::Perform()
  for (itl.Initialize(myConstEdges); itl.More(); itl.Next()) {
    TopoDS_Edge& E = TopoDS::Edge(itl.Value());
    if (DejaVu.Add(E))
-      StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute, myTolConf);
+      StoreInMVE(myFace,E,MVE,YaCouture,myVerticesForSubstitute);
  }

 #ifdef DRAW
@@ -627,42 +626,42 @@ void BRepAlgo_Loop::Perform()
    //--------------------------------
    RemovePendingEdges(MVE);

-    if (MVE.Extent() == 0) break;
+    if (MVE.Extent() == 0) break; 
    //--------------------------------
    // Start edge.
    //--------------------------------
    EF = CE = TopoDS::Edge(MVE(1).First());
-    TopExp::Vertices(CE, V1, V2);
+    TopExp::Vertices(CE,V1,V2);
    //--------------------------------
    // VF vertex start of new wire
    //--------------------------------
-    if (CE.Orientation() == TopAbs_FORWARD) { CV = VF = V1; }
-    else { CV = VF = V2; }
+    if (CE.Orientation() == TopAbs_FORWARD) { CV = VF = V1;}
+    else                                    { CV = VF = V2;}
    if (!MVE.Contains(CV)) continue;
    TopTools_ListOfShape& aListEdges = MVE.ChangeFromKey(CV);
-    for (itl.Initialize(aListEdges); itl.More(); itl.Next()) {
+    for ( itl.Initialize(aListEdges); itl.More(); itl.Next()) {
      if (itl.Value().IsEqual(CE)) {
-        aListEdges.Remove(itl);
-        break;
+	aListEdges.Remove(itl);
+	break;
      }
    }
-    End = Standard_False;
-
+    End  = Standard_False;
+    
    while (!End) {
      //-------------------------------
      // Construction of a wire.
      //-------------------------------
-      TopExp::Vertices(CE, V1, V2);
+      TopExp::Vertices(CE,V1,V2);
      if (!CV.IsSame(V1)) CV = V1; else CV = V2;

-      B.Add(NW, CE);
+      B.Add (NW,CE);
      UsedEdges.Add(CE);

      if (!MVE.Contains(CV) || MVE.FindFromKey(CV).IsEmpty()) {
        End = Standard_True;
      }
      else {
-        End = !SelectEdge(myFace, CE, CV, NE, MVE.ChangeFromKey(CV));
+        End = !SelectEdge(myFace,CE,CV,NE,MVE.ChangeFromKey(CV));
        if (!End) {
          CE = NE;
          if (MVE.FindFromKey(CV).IsEmpty())
@@ -673,41 +672,35 @@ void BRepAlgo_Loop::Perform()
    //--------------------------------------------------
    // Add new wire to the set of wires
    //------------------------------------------------
+    Standard_Real Tol = 0.001; //5.e-05; //5.e-07;
+    TopExp_Explorer explo( NW, TopAbs_VERTEX );
+    for (; explo.More(); explo.Next())
+      {
+      const TopoDS_Vertex& aV = TopoDS::Vertex( explo.Current() );
+      Handle(BRep_TVertex)& TV = *((Handle(BRep_TVertex)*) &(aV).TShape());
+      TV->Tolerance( Tol );
+      TV->Modified( Standard_True );
+      }
+    for (explo.Init( NW, TopAbs_EDGE ); explo.More(); explo.Next())
+      {
+      const TopoDS_Edge& aE = TopoDS::Edge( explo.Current() );
+      Handle(BRep_TEdge)& TE = *((Handle(BRep_TEdge)*) &(aE).TShape());
+      TE->Tolerance( Tol );
+      TE->Modified( Standard_True );
+      }

-    if (VF.IsSame(CV))
+    if (VF.IsSame(CV) && SamePnt2d(VF,EF,CE,myFace))
    {
-      if (SamePnt2d(VF, EF, CE, myFace))
-      {
-        NW.Closed(Standard_True);
-        myNewWires.Append(NW);
-      }
-      else if(BRep_Tool::Tolerance(VF) < myTolConf)
-      {
-        BRep_Builder aBB;
-        aBB.UpdateVertex(VF, myTolConf);
-        if (SamePnt2d(VF, EF, CE, myFace))
-        {
-          NW.Closed(Standard_True);
-          myNewWires.Append(NW);
-        }
-#ifdef OCCT_DEBUG_ALGO
-        else
-        {
-          std::cout << "BRepAlgo_Loop: Open Wire" << std::endl;
-          if (AffichLoop)
-            std::cout << "OpenWire is : NW_" << NbLoops << "_" << NbWires << std::endl;
-        }
-#endif
-      }
+      NW.Closed (Standard_True);
+      myNewWires.Append (NW);
    }
 #ifdef OCCT_DEBUG_ALGO
    else {
-      std::cout << "BRepAlgo_Loop: Open Wire" << std::endl;
+      std::cout <<"BRepAlgo_Loop: Open Wire"<<std::endl;
      if (AffichLoop)
-        std::cout << "OpenWire is : NW_" << NbLoops << "_" << NbWires << std::endl;
-    }
+        std::cout << "OpenWire is : NW_"<<NbLoops<<"_"<<NbWires<<std::endl;
+      }
 #endif
-
 #ifdef DRAW
    if (AffichLoop) {
      sprintf(name,"NW_%d_%d",NbLoops,NbWires++);	
@@ -784,6 +777,8 @@ void BRepAlgo_Loop::CutEdge (const TopoDS_Edge&          E,
      VF = TopoDS::Vertex(aLocalV);
      aLocalV = VCEI.Oriented(TopAbs_REVERSED); 
      VL = TopoDS::Vertex(aLocalV);
+//      VF = TopoDS::Vertex(VCEI.Oriented(TopAbs_FORWARD));
+//      VL = TopoDS::Vertex(VCEI.Oriented(TopAbs_REVERSED)); 
    }
    SV.Prepend(VF);
    SV.Append(VL);
@@ -818,9 +813,13 @@ void BRepAlgo_Loop::CutEdge (const TopoDS_Edge&          E,
      B.Add  (NewEdge,aLocalEdge);
      aLocalEdge = V2.Oriented(TopAbs_REVERSED);
      B.Add  (TopoDS::Edge(NewEdge),aLocalEdge);
+//      B.Add  (NewEdge,V1.Oriented(TopAbs_FORWARD));
+//      B.Add  (NewEdge,V2.Oriented(TopAbs_REVERSED));
      if (V1.IsSame(VF)) 
 	U1 = f;
      else 
+//	U1=BRep_Tool::Parameter
+//	  (TopoDS::Vertex(V1.Oriented(TopAbs_INTERNAL)),WE);
 	{
 	  TopoDS_Shape aLocalV = V1.Oriented(TopAbs_INTERNAL);
 	  U1=BRep_Tool::Parameter(TopoDS::Vertex(aLocalV),WE);
@@ -831,6 +830,8 @@ void BRepAlgo_Loop::CutEdge (const TopoDS_Edge&          E,
 	{
 	  TopoDS_Shape aLocalV = V2.Oriented(TopAbs_INTERNAL);
 	  U2=BRep_Tool::Parameter(TopoDS::Vertex(aLocalV),WE);
+//	U2=BRep_Tool::Parameter
+//	  (TopoDS::Vertex(V2.Oriented(TopAbs_INTERNAL)),WE);
 	}
      B.Range (TopoDS::Edge(NewEdge),U1,U2);
 #ifdef DRAW
--- a/src/BRepAlgo/BRepAlgo_Loop.hxx
+++ b/src/BRepAlgo/BRepAlgo_Loop.hxx
@@ -86,17 +86,8 @@ public:
  
  Standard_EXPORT void VerticesForSubstitute (TopTools_DataMapOfShapeShape& VerVerMap);

-  //! Set maximal tolerance used for comparing distaces between vertices. 
-  void SetTolConf(const Standard_Real theTolConf)
-  {
-    myTolConf = theTolConf;
-  }

-  //! Get maximal tolerance used for comparing distaces between vertices. 
-  Standard_Real GetTolConf() const
-  {
-    return myTolConf;
-  }
+

 protected:

@@ -117,7 +108,6 @@ private:
  TopTools_DataMapOfShapeListOfShape myCutEdges;
  TopTools_DataMapOfShapeShape myVerticesForSubstitute;
  BRepAlgo_Image myImageVV;
-  Standard_Real myTolConf;


 };
--- a/src/BRepAlgoAPI/BRepAlgoAPI_Algo.hxx
+++ b/src/BRepAlgoAPI/BRepAlgoAPI_Algo.hxx
@@ -34,8 +34,6 @@ public:

  DEFINE_STANDARD_ALLOC

-  //! Returns a shape built by the shape construction algorithm.
-  //! Does not check if the shape is built.
  Standard_EXPORT virtual const TopoDS_Shape& Shape() Standard_OVERRIDE;

  // Provide access to methods of protected base class BOPAlgo_Options
--- a/src/BRepBlend/BRepBlend_CSWalking.hxx
+++ b/src/BRepBlend/BRepBlend_CSWalking.hxx
@@ -51,7 +51,7 @@ public:
  
  Standard_EXPORT BRepBlend_CSWalking(const Handle(Adaptor3d_Curve)& Curv, const Handle(Adaptor3d_Surface)& Surf, const Handle(Adaptor3d_TopolTool)& Domain);
  
-  Standard_EXPORT void Perform (Blend_CSFunction& F, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_CSFunction& F, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
  
  Standard_EXPORT Standard_Boolean Complete (Blend_CSFunction& F, const Standard_Real Pmin);
  
@@ -80,7 +80,7 @@ private:
  Handle(Adaptor3d_Surface) surf;
  Handle(Adaptor3d_Curve) curv;
  Handle(Adaptor3d_TopolTool) domain;
-  Standard_Real tolpoint3d;
+  Standard_Real tolesp;
  Standard_Real tolgui;
  Standard_Real pasmax;
  Standard_Real fleche;
--- a/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
+++ b/src/BRepBlend/BRepBlend_RstRstLineBuilder.cxx
@@ -173,7 +173,7 @@ BRepBlend_RstRstLineBuilder::BRepBlend_RstRstLineBuilder
 done(Standard_False), sol(1, 2), surf1(Surf1),
 domain1(Domain1), surf2(Surf2),
 domain2(Domain2), rst1(Rst1), rst2(Rst2),
- tolpoint3d(0.0), tolgui(0.0), pasmax(0.0),
+ tolesp(0.0), tolgui(0.0), pasmax(0.0),
 fleche(0.0), param(0.0), rebrou(Standard_False),
 iscomplete(Standard_False), comptra(Standard_False), sens(0.0),
 decrochdeb(Blend_NoDecroch), decrochfin(Blend_NoDecroch)
@@ -193,9 +193,9 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
 					  const Standard_Real     Pdep,
 					  const Standard_Real     Pmax,
 					  const Standard_Real     MaxStep,
-            const Standard_Real     Tol3d,
 					  const Standard_Real     TolGuide,
 					  const math_Vector&      ParDep,
+					  const Standard_Real     Tolesp,
 					  const Standard_Real     Fleche,
 					  const Standard_Boolean  Appro) 
 {
@@ -203,7 +203,7 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
  iscomplete = Standard_False;
  comptra    = Standard_False;
  line       = new BRepBlend_Line();
-  tolpoint3d   = Tol3d;
+  tolesp     = Abs(Tolesp);
  tolgui     = Abs(TolGuide);
  fleche     = Abs(Fleche);
  rebrou     = Standard_False;
@@ -225,7 +225,7 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
    TopAbs_State siturst1, siturst2;
    Blend_DecrochStatus decroch;
    math_Vector tolerance(1, 2), infbound(1, 2), supbound(1, 2);
-    Func.GetTolerance(tolerance, tolpoint3d);
+    Func.GetTolerance(tolerance, tolesp);
    Func.GetBounds(infbound, supbound);
    math_FunctionSetRoot rsnld(Func, tolerance, 30);
    
@@ -258,9 +258,9 @@ void BRepBlend_RstRstLineBuilder::Perform(Blend_RstRstFunction&   Func,
  U = previousP.ParameterOnC1();
  V = previousP.ParameterOnC2();
  BRepBlend_Extremity ptf1 (previousP.PointOnC1(),
-			    U, previousP.Parameter(),tolpoint3d);
+			    U, previousP.Parameter(),tolesp);
  BRepBlend_Extremity ptf2 (previousP.PointOnC2(),
-			    V, previousP.Parameter(),tolpoint3d);
+			    V, previousP.Parameter(),tolesp);
  if (!previousP.IsTangencyPoint()) {
    ptf1.SetTangent(previousP.TangentOnC1());
    ptf2.SetTangent(previousP.TangentOnC2());
@@ -291,7 +291,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
 const Standard_Real     Pdep,
 const Standard_Real     Pmax,
 const math_Vector&      ParDep,
- const Standard_Real     Tol3d,
+ const Standard_Real     Tolesp,
 const Standard_Real     TolGuide,
 const Standard_Boolean  RecRst1,
 const Standard_Boolean  RecP1,
@@ -304,7 +304,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
  iscomplete = Standard_False;
  comptra    = Standard_False;
  line       = new BRepBlend_Line();
-  tolpoint3d   = Tol3d;
+  tolesp     = Abs(Tolesp);
  tolgui     = Abs(TolGuide);
  rebrou     = Standard_False;
  
@@ -327,7 +327,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::PerformFirstSection
  wp1   = wp2 = wrst1 = wrst2 = Pmax;
  param = Pdep;
  Func.Set(param);
-  Func.GetTolerance(tolerance, tolpoint3d);
+  Func.GetTolerance(tolerance, tolesp);
  Func.GetBounds(infbound, supbound);

  math_FunctionSetRoot rsnld(Func, tolerance, 30);
@@ -573,7 +573,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,

  //IntSurf_Transition Tline, Tarc;

-  Func.GetTolerance(tolerance, tolpoint3d);
+  Func.GetTolerance(tolerance, tolesp);
  Func.GetBounds(infbound, supbound);

  math_FunctionSetRoot rsnld(Func, tolerance, 30);
@@ -595,14 +595,14 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
    if (rsnld.IsDone()) {
      rsnld.Root(sol);
      Blend_Point bp1;
-      if(BBPP(param, Func, sol, tolpoint3d, bp1)){
+      if(BBPP(param, Func, sol, tolesp, bp1)){
 	Standard_Real dw = 1.e-10;
 	Func.Set(param + dw);
 	rsnld.Perform(Func, parinit, infbound, supbound);
 	if (rsnld.IsDone()) {
 	  rsnld.Root(sol);
 	  Blend_Point bp2;
-	  if(BBPP(param + dw, Func, sol, tolpoint3d, bp2)){
+	  if(BBPP(param + dw, Func, sol, tolesp, bp2)){
 	    tracederiv(Func, bp1, bp2);
 	  }
 	}
@@ -854,7 +854,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 	  Arrive = Standard_True;
 	  Extrst1.SetValue(previousP.PointOnC1(),
 			   previousP.ParameterOnC1(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2);
 	  // Show that end is on Bound.
 	}
@@ -873,10 +873,10 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 	if (Abs(stepw) < tolgui) {
 	  Extrst1.SetValue(previousP.PointOnC1(),
 			   previousP.ParameterOnC1(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  Extrst2.SetValue(previousP.PointOnC2(),
 			   previousP.ParameterOnC2(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  Arrive = Standard_True;
 #ifdef OCCT_DEBUG
 	  if (line->NbPoints()>=2) {
@@ -913,7 +913,7 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 	  Arrive = Standard_True;
 	  Extrst1.SetValue(previousP.PointOnC1(),
 			   previousP.ParameterOnC1(),
-			   previousP.Parameter(), tolpoint3d);
+			   previousP.Parameter(), tolesp);
 	  MakeExtremity(Extrst2, Standard_False, rst2, sol(2), IsVtxrst2, Vtxrst2);
 	  // Indicate that end is on Bound.
 	}
@@ -993,10 +993,10 @@ void BRepBlend_RstRstLineBuilder::InternalPerform(Blend_RstRstFunction&   Func,
 #endif
 	Extrst1.SetValue(previousP.PointOnC1(),
 			 previousP.ParameterOnC1(),
-			 previousP.Parameter(), tolpoint3d);
+			 previousP.Parameter(), tolesp);
 	Extrst2.SetValue(previousP.PointOnC2(),
 			 previousP.ParameterOnC2(),
-			 previousP.Parameter(), tolpoint3d);
+			 previousP.Parameter(), tolesp);
 	Arrive = Standard_True;
      }
      break;
@@ -1029,7 +1029,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&
 						       Handle(Adaptor3d_HVertex)& Vtx) 
 {
  math_Vector toler(1, 3), infb(1, 3), supb(1, 3);
-  Finv.GetTolerance(toler, tolpoint3d);
+  Finv.GetTolerance(toler, tolesp);
  Finv.GetBounds(infb, supb);
  Solinv(1) = param;
  Solinv(2) = sol(2);
@@ -1049,7 +1049,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&

  // It is necessary to check if the function value meets the
  // second restriction
-  if (Finv.IsSolution(Solinv, tolpoint3d)) {
+  if (Finv.IsSolution(Solinv, tolesp)) {
    Standard_Real w = Solinv(2);
    if(w < rst2->FirstParameter() - toler(2)||
       w > rst2->LastParameter() + toler(2)){
@@ -1079,7 +1079,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_RstRstFunction&

    math_Vector infbound(1, 2), supbound(1, 2);
    math_Vector parinit(1, 2), tolerance(1, 2);
-    Func.GetTolerance(tolerance, tolpoint3d);
+    Func.GetTolerance(tolerance, tolesp);
    Func.GetBounds(infbound, supbound);

    math_FunctionSetRoot rsnld2(Func, tolerance, 30);
@@ -1112,7 +1112,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
 						       Handle(Adaptor3d_HVertex)& Vtx) 
 {
  math_Vector toler(1, 3), infb(1, 3), supb(1, 3);
-  Finv.GetTolerance(toler, tolpoint3d);
+  Finv.GetTolerance(toler, tolesp);
  Finv.GetBounds(infb, supb);
  Solinv(1) = param;
  Solinv(2) = sol(1);
@@ -1130,7 +1130,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
  rsnld.Root(Solinv);

  // It is necessary to check the value of the function
-  if (Finv.IsSolution(Solinv, tolpoint3d)) {
+  if (Finv.IsSolution(Solinv, tolesp)) {
    Standard_Real w = Solinv(2);
    if(w < rst1->FirstParameter() - toler(2)||
       w > rst1->LastParameter() + toler(2)){
@@ -1159,7 +1159,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_RstRstFunction&
   
    math_Vector infbound(1, 2), supbound(1, 2);
    math_Vector parinit(1,2), tolerance(1,2);
-    Func.GetTolerance(tolerance, tolpoint3d);
+    Func.GetTolerance(tolerance, tolesp);
    Func.GetBounds(infbound, supbound);

    math_FunctionSetRoot rsnld2(Func, tolerance, 30);
@@ -1199,7 +1199,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&

  FinvP.Set(thepoint);
  math_Vector toler(1,2), infb(1, 2), supb(1, 2);
-  FinvP.GetTolerance(toler, tolpoint3d);
+  FinvP.GetTolerance(toler, tolesp);
  FinvP.GetBounds(infb, supb);
  Solinv(1) = param;
  Solinv(2) = sol(2);
@@ -1214,7 +1214,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre1(Blend_CurvPointFuncInv&
  }
  rsnld.Root(Solinv);
  
-  if(FinvP.IsSolution(Solinv, tolpoint3d)){
+  if(FinvP.IsSolution(Solinv, tolesp)){
    gp_Pnt2d p2drst2  = rst2->Value(Solinv(2));
    TopAbs_State situ = domain2->Classify(p2drst2, toler(2), 0);
    if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
@@ -1267,7 +1267,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv&

  FinvP.Set(thepoint);
  math_Vector toler(1,2), infb(1, 2), supb(1, 2);
-  FinvP.GetTolerance(toler, tolpoint3d);
+  FinvP.GetTolerance(toler, tolesp);
  FinvP.GetBounds(infb, supb);
  Solinv(1) = param;
  Solinv(2) = sol(1);
@@ -1282,7 +1282,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::Recadre2(Blend_CurvPointFuncInv&
  }
  rsnld.Root(Solinv);
  
-  if(FinvP.IsSolution(Solinv, tolpoint3d)){
+  if(FinvP.IsSolution(Solinv, tolesp)){
    gp_Pnt2d p2drst1  = rst1->Value(Solinv(2));
    TopAbs_State situ = domain1->Classify(p2drst1, toler(2), 0);
    if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
@@ -1378,7 +1378,7 @@ void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
  if (OnFirst) {
    Extrem.SetValue(previousP.PointOnC1(),
 		    sol(1),
-		    previousP.Parameter(), tolpoint3d);
+		    previousP.Parameter(), tolesp);
    if (!previousP.IsTangencyPoint()) 
      Extrem.SetTangent(previousP.TangentOnC1());
    Iter = domain1;
@@ -1386,7 +1386,7 @@ void BRepBlend_RstRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
  else {
    Extrem.SetValue(previousP.PointOnC2(),
 		    sol(2),
-		    previousP.Parameter(), tolpoint3d);
+		    previousP.Parameter(), tolesp);
    if (!previousP.IsTangencyPoint()) 
      Extrem.SetTangent(previousP.TangentOnC1());
    Iter = domain2;
@@ -1453,13 +1453,12 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst1(const Blend_Poin
  Norme = Corde.SquareMagnitude();
  if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude();

-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d) {
+  if (Norme <= tolesp * tolesp) {
    // it can be necessary to force the same point
    return Blend_SamePoints;
  }
  if(!prevpointistangent){
-    if (prevNorme <= toler3d * toler3d) {
+    if (prevNorme <= tolesp * tolesp) {
      return Blend_SamePoints;
    }
    Cosi = sens * Corde * prevTg;
@@ -1531,13 +1530,12 @@ Blend_Status BRepBlend_RstRstLineBuilder::CheckDeflectionOnRst2(const Blend_Poin
  Norme = Corde.SquareMagnitude();
  if (!prevpointistangent) prevNorme = prevTg.SquareMagnitude();

-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d){
+  if (Norme <= tolesp * tolesp){
    // it can be necessary to force the same point
    return Blend_SamePoints;
  }
  if (!prevpointistangent) {
-    if (prevNorme <= toler3d * toler3d) {
+    if (prevNorme <= tolesp * tolesp) {
      return Blend_SamePoints;
    }
    Cosi = sens * Corde * prevTg;
@@ -1599,7 +1597,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::TestArret(Blend_RstRstFunction& Func,
  IntSurf_TypeTrans trarst1 = IntSurf_Undecided, trarst2 = IntSurf_Undecided;
  Blend_Point curpoint;

-  if (Func.IsSolution(sol, tolpoint3d)) {
+  if (Func.IsSolution(sol, tolesp)) {
    Standard_Boolean curpointistangent = Func.IsTangencyPoint();
    ptrst1   = Func.PointOnRst1();
    ptrst2   = Func.PointOnRst2();
@@ -1646,7 +1644,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::TestArret(Blend_RstRstFunction& Func,
      Standard_Real testra = tg2drst1.Dot(tg2drstref);
      TopAbs_Orientation Or = domain1->Orientation(rst1);

-      if (Abs(testra) > tolpoint3d) {
+      if (Abs(testra) > tolesp) {
 	if (testra < 0.) {
          trarst1 = ConvOrToTra(TopAbs::Reverse(Or));
 	}
@@ -1658,7 +1656,7 @@ Blend_Status BRepBlend_RstRstLineBuilder::TestArret(Blend_RstRstFunction& Func,
 	testra = tg2drst2.Dot(tg2drstref);

 	Or = domain2->Orientation(rst2);
-	if (Abs(testra) > tolpoint3d) {
+	if (Abs(testra) > tolesp) {
 	  if (testra < 0.) {
 	    trarst2 = ConvOrToTra(TopAbs::Reverse(Or));
 	  }
@@ -1707,7 +1705,7 @@ Standard_Boolean BRepBlend_RstRstLineBuilder::CheckInside(Blend_RstRstFunction&
 {
 //  Standard_Boolean inside = Standard_True;
  math_Vector tolerance(1, 2);
-  Func.GetTolerance(tolerance, tolpoint3d);
+  Func.GetTolerance(tolerance, tolesp);

  //face pcurve 1.
  Standard_Real v = sol(1);
--- a/src/BRepBlend/BRepBlend_RstRstLineBuilder.hxx
+++ b/src/BRepBlend/BRepBlend_RstRstLineBuilder.hxx
@@ -72,9 +72,9 @@ public:
  
  Standard_EXPORT BRepBlend_RstRstLineBuilder(const Handle(Adaptor3d_Surface)& Surf1, const Handle(Adaptor2d_Curve2d)& Rst1, const Handle(Adaptor3d_TopolTool)& Domain1, const Handle(Adaptor3d_Surface)& Surf2, const Handle(Adaptor2d_Curve2d)& Rst2, const Handle(Adaptor3d_TopolTool)& Domain2);
  
-  Standard_EXPORT void Perform (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
  
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real& Psol, math_Vector& ParSol);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst1, const Standard_Boolean RecP1, const Standard_Boolean RecRst2, const Standard_Boolean RecP2, Standard_Real& Psol, math_Vector& ParSol);
  
  Standard_EXPORT Standard_Boolean Complete (Blend_RstRstFunction& Func, Blend_SurfCurvFuncInv& Finv1, Blend_CurvPointFuncInv& FinvP1, Blend_SurfCurvFuncInv& Finv2, Blend_CurvPointFuncInv& FinvP2, const Standard_Real Pmin);
  
@@ -134,7 +134,7 @@ private:
  Handle(Adaptor3d_TopolTool) domain2;
  Handle(Adaptor2d_Curve2d) rst1;
  Handle(Adaptor2d_Curve2d) rst2;
-  Standard_Real tolpoint3d;
+  Standard_Real tolesp;
  Standard_Real tolgui;
  Standard_Real pasmax;
  Standard_Real fleche;
--- a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
+++ b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.cxx
@@ -210,7 +210,7 @@ BRepBlend_SurfRstLineBuilder::BRepBlend_SurfRstLineBuilder
 const Handle(Adaptor3d_TopolTool)& Domain2):
 done(Standard_False), sol(1, 3), surf1(Surf1),
 domain1(Domain1), surf2(Surf2), rst(Rst),
- domain2(Domain2), tolpoint3d(0.0), tolpoint2d(0.0), tolgui(0.0),
+ domain2(Domain2), tolesp(0.0), tolgui(0.0),
 pasmax(0.0), fleche(0.0), param(0.0),
 rebrou(Standard_False), iscomplete(Standard_False),
 comptra(Standard_False), sens(0.0),
@@ -230,10 +230,9 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
 					   const Standard_Real     Pdep,
 					   const Standard_Real     Pmax,
 					   const Standard_Real     MaxStep,
-             const Standard_Real     Tol3d,
-             const Standard_Real     Tol2d,
 					   const Standard_Real     TolGuide,
 					   const math_Vector&      ParDep,
+					   const Standard_Real     Tolesp,
 					   const Standard_Real     Fleche,
 					   const Standard_Boolean  Appro) 
 {
@@ -241,8 +240,7 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
  iscomplete = Standard_False;
  comptra = Standard_False;
  line = new BRepBlend_Line();
-  tolpoint3d = Tol3d;
-  tolpoint2d = Tol2d;
+  tolesp = Abs(Tolesp);
  tolgui = Abs(TolGuide);
  fleche = Abs(Fleche);
  rebrou = Standard_False;
@@ -264,7 +262,7 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
    TopAbs_State siturst,situs;
    Standard_Boolean decroch;
    math_Vector tolerance(1,3),infbound(1,3),supbound(1,3);
-    Func.GetTolerance(tolerance,tolpoint3d);
+    Func.GetTolerance(tolerance,tolesp);
    Func.GetBounds(infbound,supbound);
    math_FunctionSetRoot rsnld(Func,tolerance,30);
    
@@ -298,9 +296,9 @@ void BRepBlend_SurfRstLineBuilder::Perform(Blend_SurfRstFunction&  Func,
 //  W = previousP.ParameterOnC();
  
  BRepBlend_Extremity ptf1(previousP.PointOnS(),
-			   U,V,previousP.Parameter(),tolpoint3d);
+			   U,V,previousP.Parameter(),tolesp);
  BRepBlend_Extremity ptf2(previousP.PointOnC(),
-			   U,V,previousP.Parameter(),tolpoint3d);
+			   U,V,previousP.Parameter(),tolesp);
  if (!previousP.IsTangencyPoint()) {
    ptf1.SetTangent(previousP.TangentOnS());
    ptf2.SetTangent(previousP.TangentOnC());
@@ -329,8 +327,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
 const Standard_Real     Pdep,
 const Standard_Real     Pmax,
 const math_Vector&      ParDep,
- const Standard_Real     Tol3d,
- const Standard_Real     Tol2d,
+ const Standard_Real     Tolesp,
 const Standard_Real     TolGuide,
 const Standard_Boolean  RecRst,
 const Standard_Boolean  RecP,
@@ -342,8 +339,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
  iscomplete = Standard_False;
  comptra = Standard_False;
  line = new BRepBlend_Line();
-  tolpoint3d = Tol3d;
-  tolpoint2d = Tol2d;
+  tolesp = Abs(Tolesp);
  tolgui = Abs(TolGuide);
  rebrou = Standard_False;
  
@@ -366,7 +362,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::PerformFirstSection
  wp = wrst = ws = Pmax;
  param = Pdep;
  Func.Set(param);
-  Func.GetTolerance(tolerance,tolpoint3d);
+  Func.GetTolerance(tolerance,tolesp);
  Func.GetBounds(infbound,supbound);

  math_FunctionSetRoot rsnld(Func,tolerance,30);
@@ -540,7 +536,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,

  //IntSurf_Transition Tline,Tarc;

-  Func.GetTolerance(tolerance,tolpoint3d);
+  Func.GetTolerance(tolerance,tolesp);
  Func.GetBounds(infbound,supbound);

  math_FunctionSetRoot rsnld(Func,tolerance,30);
@@ -562,14 +558,14 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
    if (rsnld.IsDone()) {
      rsnld.Root(sol);
      Blend_Point bp1;
-      if(BBPP(param,Func,sol,tolpoint3d,bp1)){
+      if(BBPP(param,Func,sol,tolesp,bp1)){
 	Standard_Real dw = 1.e-10;
 	Func.Set(param+dw);
 	rsnld.Perform(Func,parinit,infbound,supbound);
 	if (rsnld.IsDone()) {
 	  rsnld.Root(sol);
 	  Blend_Point bp2;
-	  if(BBPP(param+dw,Func,sol,tolpoint3d,bp2)){
+	  if(BBPP(param+dw,Func,sol,tolesp,bp2)){
 	    tracederiv(Func,bp1,bp2);
 	  }
 	}
@@ -750,7 +746,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	  Arrive = Standard_True;
 	  Exts.SetValue(previousP.PointOnS(),
 			sol(1),sol(2),
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	  MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
 	  // Indicate end on Bound.
 	}
@@ -769,10 +765,10 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	if (Abs(stepw) < tolgui) {
 	  previousP.ParametersOnS(U,V);
 	  Exts.SetValue(previousP.PointOnS(),U,V,
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	  Extrst.SetValue(previousP.PointOnC(),
 			  previousP.ParameterOnC(),
-			  previousP.Parameter(),tolpoint3d);
+			  previousP.Parameter(),tolesp);
 	  Arrive = Standard_True;
 	  if (line->NbPoints()>=2) {
 	    // Indicate that one stops during the processing
@@ -808,7 +804,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	if (param == Bound) {
 	  Arrive = Standard_True;
 	  Exts.SetValue(previousP.PointOnS(),sol(1),sol(2),
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	  MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
 	  // Indicate end on Bound.
 	}
@@ -854,7 +850,7 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 	  line->Prepend(previousP);
 	}
 	Exts.SetValue(previousP.PointOnS(),sol(1),sol(2),
-		      previousP.Parameter(),tolpoint3d);
+		      previousP.Parameter(),tolesp);
 	MakeExtremity(Extrst,Standard_False,rst,sol(3),IsVtxrst,Vtxrst);
 	Arrive = Standard_True;
      }
@@ -887,10 +883,10 @@ void BRepBlend_SurfRstLineBuilder::InternalPerform(Blend_SurfRstFunction&  Func,
 #endif
 	previousP.ParametersOnS(U,V);
 	Exts.SetValue(previousP.PointOnS(),U,V,
-		      previousP.Parameter(),tolpoint3d);
+		      previousP.Parameter(),tolesp);
 	Extrst.SetValue(previousP.PointOnC(),
 			previousP.ParameterOnC(),
-			previousP.Parameter(),tolpoint3d);
+			previousP.Parameter(),tolesp);
 	Arrive = Standard_True;
      }
      break;
@@ -945,10 +941,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
  FinvC.Set(Arc);
  
  math_Vector toler(1,3),infb(1,3),supb(1,3);
-  // use reduced Tol argument value to pass testcase
-  // blend complex A6 with scale factor of model 0.1 (base scale = 1000)
-  // So, here we using 1.0e-5 rather than 1.0e-4 of tolerance of point in 3d
-  FinvC.GetTolerance(toler,0.1 * tolpoint3d);
+  FinvC.GetTolerance(toler,tolesp);
  FinvC.GetBounds(infb,supb);
  Solinv(1) = param;
  Solinv(2) = sol(3);
@@ -965,7 +958,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
  else {
      // It is necessary to check the value of the function
    rsnld.Root(Solinv);
-    recadre = FinvC.IsSolution(Solinv,tolpoint3d);
+    recadre = FinvC.IsSolution(Solinv,tolesp);
  }

  // In case of fail, it is checked if another arc 
@@ -988,7 +981,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
    Arc = domain1->Value();
    FinvC.Set(Arc);
  
-    FinvC.GetTolerance(toler,tolpoint3d);
+    FinvC.GetTolerance(toler,tolesp);
    FinvC.GetBounds(infb,supb);

    Solinv(3) = pmin;
@@ -1004,7 +997,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfCurvFuncInv&
    else {
      // It is necessary to check the value of the function
      aRsnld.Root(Solinv);
-      recadre = FinvC.IsSolution(Solinv,tolpoint3d);
+      recadre = FinvC.IsSolution(Solinv,tolesp);
    }
  }  

@@ -1048,7 +1041,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&
 						       Handle(Adaptor3d_HVertex)& Vtx) 
 {
  math_Vector toler(1,4),infb(1,4),supb(1,4);
-  Finv.GetTolerance(toler,tolpoint3d);
+  Finv.GetTolerance(toler,tolesp);
  Finv.GetBounds(infb,supb);
  Solinv(1) = sol(3);
  Solinv(2) = param;
@@ -1065,9 +1058,9 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&
  }
  rsnld.Root(Solinv);
  
-  if(Finv.IsSolution(Solinv,tolpoint3d)){
+  if(Finv.IsSolution(Solinv,tolesp)){
    gp_Pnt2d p2d(Solinv(3),Solinv(4));
-    TopAbs_State situ = domain1->Classify(p2d,tolpoint2d,0);
+    TopAbs_State situ = domain1->Classify(p2d,Min(toler(3),toler(4)),0);
    if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
      return Standard_False;
    }
@@ -1093,7 +1086,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfRstFunction&

    math_Vector infbound(1,3),supbound(1,3);
    math_Vector parinit(1,3),tolerance(1,3);
-    Func.GetTolerance(tolerance,tolpoint3d);
+    Func.GetTolerance(tolerance,tolesp);
    Func.GetBounds(infbound,supbound);

    math_FunctionSetRoot rsnld2(Func,tolerance,30);
@@ -1133,7 +1126,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfPointFuncInv&

  FinvP.Set(thepoint);
  math_Vector toler(1,3),infb(1,3),supb(1,3);
-  FinvP.GetTolerance(toler,tolpoint3d);
+  FinvP.GetTolerance(toler,tolesp);
  FinvP.GetBounds(infb,supb);
  Solinv(1) = param;
  Solinv(2) = sol(1);
@@ -1149,9 +1142,9 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::Recadre(Blend_SurfPointFuncInv&
  }
  rsnld.Root(Solinv);
  
-  if(FinvP.IsSolution(Solinv,tolpoint3d)){
+  if(FinvP.IsSolution(Solinv,tolesp)){
    gp_Pnt2d p2d(Solinv(2),Solinv(3));
-    TopAbs_State situ = domain1->Classify(p2d,tolpoint2d,0);
+    TopAbs_State situ = domain1->Classify(p2d,Min(toler(2),toler(3)),0);
    if ((situ != TopAbs_IN) && (situ != TopAbs_ON)) {
      return Standard_False;
    }
@@ -1244,7 +1237,7 @@ void BRepBlend_SurfRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
  if (OnFirst) {
    Extrem.SetValue(previousP.PointOnS(),
 		    sol(1),sol(2),
-		    previousP.Parameter(),tolpoint3d);
+		    previousP.Parameter(),tolesp);
    if (!previousP.IsTangencyPoint()) 
      Extrem.SetTangent(previousP.TangentOnS());
    Iter = domain1;
@@ -1252,7 +1245,7 @@ void BRepBlend_SurfRstLineBuilder::MakeExtremity(BRepBlend_Extremity&
  else {
    Extrem.SetValue(previousP.PointOnC(),
 		    sol(3),
-		    previousP.Parameter(),tolpoint3d);
+		    previousP.Parameter(),tolesp);
    if (!previousP.IsTangencyPoint()) 
      Extrem.SetTangent(previousP.TangentOnC());    
    Iter = domain2;
@@ -1319,13 +1312,12 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnSurf(const Blend_Poi
 //  if(!curpointistangent) curNorme = Tgsurf.SquareMagnitude();
  if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude();

-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d){
+  if (Norme <= tolesp*tolesp){
    // it can be necessary to force same point
    return Blend_SamePoints;
  }
  if(!prevpointistangent){
-    if(prevNorme <= toler3d * toler3d) {
+    if(prevNorme <= tolesp*tolesp) {
      return Blend_SamePoints;
    }
    Cosi = sens*Corde*prevTg;
@@ -1396,13 +1388,12 @@ Blend_Status BRepBlend_SurfRstLineBuilder::CheckDeflectionOnRst(const Blend_Poin
 //  if(!curpointistangent) curNorme = Tgsurf.SquareMagnitude();
  if(!prevpointistangent) prevNorme = prevTg.SquareMagnitude();

-  const Standard_Real toler3d = 0.01 * tolpoint3d;
-  if (Norme <= toler3d * toler3d){
+  if (Norme <= tolesp*tolesp){
    // it can be necessary to force same point
    return Blend_SamePoints;
  }
  if(!prevpointistangent){
-    if(prevNorme <= toler3d * toler3d) {
+    if(prevNorme <= tolesp*tolesp) {
      return Blend_SamePoints;
    }
    Cosi = sens*Corde*prevTg;
@@ -1464,7 +1455,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::TestArret(Blend_SurfRstFunction& Func
  IntSurf_TypeTrans tras = IntSurf_Undecided, trarst = IntSurf_Undecided;
  Blend_Point curpoint;

-  if (Func.IsSolution(sol,tolpoint3d)) {
+  if (Func.IsSolution(sol,tolesp)) {
    Standard_Boolean curpointistangent = Func.IsTangencyPoint();
    pts = Func.PointOnS();
    ptrst = Func.PointOnRst();
@@ -1508,7 +1499,7 @@ Blend_Status BRepBlend_SurfRstLineBuilder::TestArret(Blend_SurfRstFunction& Func
      Func.Decroch(sol,nors,tgsecs);
      nors.Normalize();
      Standard_Real testra = tgsecs.Dot(nors.Crossed(tgs));
-      if (Abs(testra) > tolpoint3d) {
+      if (Abs(testra) > tolesp) {
 	if (testra < 0.) {
 	  tras = IntSurf_In;
 	}
@@ -1567,7 +1558,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::CheckInside(Blend_SurfRstFunction
 							   Standard_Boolean&      Decroch)
 {
  math_Vector tolerance(1,3);
-  Func.GetTolerance(tolerance,tolpoint3d);
+  Func.GetTolerance(tolerance,tolesp);
  //face pcurve.
  Standard_Real w = sol(3);
  if(w < rst->FirstParameter() - tolerance(3)||
@@ -1582,7 +1573,7 @@ Standard_Boolean BRepBlend_SurfRstLineBuilder::CheckInside(Blend_SurfRstFunction

  //face surface
  gp_Pnt2d p2d(sol(1),sol(2));
-  SituOnS = domain1->Classify(p2d,tolpoint2d,0);
+  SituOnS = domain1->Classify(p2d,Min(tolerance(1),tolerance(2)),0);

  //lost contact
  gp_Vec tgs,nors;
--- a/src/BRepBlend/BRepBlend_SurfRstLineBuilder.hxx
+++ b/src/BRepBlend/BRepBlend_SurfRstLineBuilder.hxx
@@ -71,9 +71,9 @@ public:
  
  Standard_EXPORT BRepBlend_SurfRstLineBuilder(const Handle(Adaptor3d_Surface)& Surf1, const Handle(Adaptor3d_TopolTool)& Domain1, const Handle(Adaptor3d_Surface)& Surf2, const Handle(Adaptor2d_Curve2d)& Rst, const Handle(Adaptor3d_TopolTool)& Domain2);
  
-  Standard_EXPORT void Perform (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
  
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tol3d, const Standard_Real Tol2d, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real& Psol, math_Vector& ParSol);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecRst, const Standard_Boolean RecP, const Standard_Boolean RecS, Standard_Real& Psol, math_Vector& ParSol);
  
  Standard_EXPORT Standard_Boolean Complete (Blend_SurfRstFunction& Func, Blend_FuncInv& Finv, Blend_SurfPointFuncInv& FinvP, Blend_SurfCurvFuncInv& FinvC, const Standard_Real Pmin);
  
@@ -128,8 +128,7 @@ private:
  Handle(Adaptor3d_Surface) surf2;
  Handle(Adaptor2d_Curve2d) rst;
  Handle(Adaptor3d_TopolTool) domain2;
-  Standard_Real tolpoint3d;
-  Standard_Real tolpoint2d;
+  Standard_Real tolesp;
  Standard_Real tolgui;
  Standard_Real pasmax;
  Standard_Real fleche;
--- a/src/BRepBlend/BRepBlend_Walking.hxx
+++ b/src/BRepBlend/BRepBlend_Walking.hxx
@@ -58,11 +58,11 @@ public:
  //! To define singular points computed before walking.
  Standard_EXPORT void AddSingularPoint (const Blend_Point& P);
  
-  Standard_EXPORT void Perform (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real Tol3d, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
+  Standard_EXPORT void Perform (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const Standard_Real MaxStep, const Standard_Real TolGuide, const math_Vector& Soldep, const Standard_Real Tolesp, const Standard_Real Fleche, const Standard_Boolean Appro = Standard_False);
  
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, const Standard_Real Pdep, math_Vector& ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, TopAbs_State& Pos1, TopAbs_State& Pos2);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, const Standard_Real Pdep, math_Vector& ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, TopAbs_State& Pos1, TopAbs_State& Pos2);
  
-  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& ParDep, const Standard_Real Tol3d, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real& Psol, math_Vector& ParSol);
+  Standard_EXPORT Standard_Boolean PerformFirstSection (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real Pdep, const Standard_Real Pmax, const math_Vector& ParDep, const Standard_Real Tolesp, const Standard_Real TolGuide, const Standard_Boolean RecOnS1, const Standard_Boolean RecOnS2, Standard_Real& Psol, math_Vector& ParSol);
  
  Standard_EXPORT Standard_Boolean Continu (Blend_Function& F, Blend_FuncInv& FInv, const Standard_Real P);
  
@@ -131,7 +131,7 @@ private:
  Standard_Boolean ToCorrectOnRst1;
  Standard_Boolean ToCorrectOnRst2;
  Standard_Real CorrectedParam;
-  Standard_Real tolpoint3d;
+  Standard_Real tolesp;
  Standard_Real tolgui;
  Standard_Real pasmax;
  Standard_Real fleche;
--- a/src/BRepBndLib/BRepBndLib.cxx
+++ b/src/BRepBndLib/BRepBndLib.cxx
@@ -47,7 +47,7 @@
 //
 static Standard_Boolean CanUseEdges(const Adaptor3d_Surface& BS);
 //
-static void FindExactUVBounds(const TopoDS_Face& F, 
+static void FindExactUVBounds(const TopoDS_Face F, 
                              Standard_Real& umin, Standard_Real& umax, 
                              Standard_Real& vmin, Standard_Real& vmax,
                              const Standard_Real Tol, 
@@ -127,14 +127,6 @@ void BRepBndLib::Add(const TopoDS_Shape& S, Bnd_Box& B, Standard_Boolean useTria
  for (ex.Init(S,TopAbs_EDGE,TopAbs_FACE); ex.More(); ex.Next())
  {
    const TopoDS_Edge& E = TopoDS::Edge(ex.Current());
- 
-    if (!useTriangulation && BRep_Tool::IsGeometric(E))
-    {
-      BC.Initialize(E);
-      BndLib_Add3dCurve::Add(BC, BRep_Tool::Tolerance(E), B);
-      continue;
-    }
-
    Handle(Poly_Polygon3D) P3d = BRep_Tool::Polygon3D(E, l);
    if (!P3d.IsNull() && P3d->NbNodes() > 0)
    {
@@ -151,7 +143,7 @@ void BRepBndLib::Add(const TopoDS_Shape& S, Bnd_Box& B, Standard_Boolean useTria
    else
    {
      BRep_Tool::PolygonOnTriangulation(E, Poly, T, l);
-      if (!Poly.IsNull() && !T.IsNull() && T->NbNodes() > 0)
+      if (useTriangulation && !Poly.IsNull() && !T.IsNull() && T->NbNodes() > 0)
      {
        const TColStd_Array1OfInteger& Indices = Poly->Nodes();
        nbNodes = Indices.Length();
@@ -460,7 +452,7 @@ Standard_Boolean CanUseEdges(const Adaptor3d_Surface& BS)
 //function : FindExactUVBounds
 //purpose  : 
 //=======================================================================
-void FindExactUVBounds(const TopoDS_Face& FF, 
+void FindExactUVBounds(const TopoDS_Face FF, 
                       Standard_Real& umin, Standard_Real& umax, 
                       Standard_Real& vmin, Standard_Real& vmax,
                       const Standard_Real Tol, 
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Collect.cxx
@@ -58,7 +58,7 @@ static void BuildBack (const TopTools_DataMapOfShapeListOfShape& M1,
 //=======================================================================

 static void  Replace (      TopTools_ListOfShape& L,
-		      const TopoDS_Shape&          Old,
+		      const TopoDS_Shape          Old,
 		      const TopTools_ListOfShape& New)
 {
  //-----------------------------------
@@ -150,7 +150,7 @@ static void Update (   TopTools_DataMapOfShapeListOfShape& Mod,
    if (!LIG.IsEmpty()) {
      if (ModBack.IsBound(S)) {
 	// Generation de modif  => generation du shape initial
-	const TopoDS_Shape& IS = ModBack(S);
+	TopoDS_Shape IS = ModBack(S);
 	StoreImage (Gen,IS,GenBack,LIG);
      }
      else {
--- a/src/BRepBuilderAPI/BRepBuilderAPI_MakeShapeOnMesh.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_MakeShapeOnMesh.cxx
@@ -237,7 +237,7 @@ void BRepBuilderAPI_MakeShapeOnMesh::Build(const Message_ProgressRange& theRange
    gp_Pln aPln(myMesh->Node(anIdx[0]), aNorm);

    BRepBuilderAPI_MakeFace aFaceMaker(aPln, aWire);
-    const TopoDS_Face& aFace = aFaceMaker.Face();
+    const TopoDS_Face aFace = aFaceMaker.Face();

    aBB.Add(aResult, aFace);
  }
--- a/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
+++ b/src/BRepBuilderAPI/BRepBuilderAPI_Sewing.cxx
@@ -374,7 +374,7 @@ TopoDS_Edge BRepBuilderAPI_Sewing::SameParameterEdge(const TopoDS_Shape& edge,
  for (Standard_Integer i = 1; i <= seqEdges.Length(); i++) {

    // Retrieve candidate section
-    const TopoDS_Shape& oedge2 = seqEdges(i);
+    TopoDS_Shape oedge2 = seqEdges(i);

    if (mySewing) {

@@ -1393,7 +1393,7 @@ void BRepBuilderAPI_Sewing::AnalysisNearestEdges(const TopTools_SequenceOfShape&
  // (they have other nearest edges belonging to the work face)
  for(Standard_Integer k = 1; k<= seqNotCandidate.Length(); k++) {
    Standard_Integer index1 = seqNotCandidate.Value(k);
-    const TopoDS_Shape& edge = sequenceSec.Value(index1);
+    TopoDS_Shape edge = sequenceSec.Value(index1);
    TopTools_SequenceOfShape tmpSeq;
    tmpSeq.Append(edge);
    for(Standard_Integer kk = 1; kk <= seqIndCandidate.Length();kk++) 
@@ -2928,7 +2928,7 @@ void BRepBuilderAPI_Sewing::VerticesAssembling(const Message_ProgressRange& theP
    for (i = 1; i <= myBoundFaces.Extent(); i++) {
      TopoDS_Shape bound = myBoundFaces.FindKey(i);
      for (TopoDS_Iterator itv(bound,Standard_False); itv.More(); itv.Next()) {
-	const TopoDS_Shape& node = itv.Value();
+	TopoDS_Shape node = itv.Value();
 	if (myNodeSections.IsBound(node))
 	  myNodeSections(node).Append(bound);
 	else {
@@ -2991,7 +2991,7 @@ static void replaceNMVertices(const TopoDS_Edge& theEdge,
      theReShape->Replace(aSeqNMVert.Value(i),theV2);
      continue;
    }
-    const TopoDS_Shape& aV = aSeqNMVert.Value(i);
+    TopoDS_Shape aV = aSeqNMVert.Value(i);
    Standard_Integer j =1;
    for( ; j <= aEdParams.Length();j++) {
      Standard_Real apar2 = aEdParams.Value(j);
@@ -3508,7 +3508,7 @@ Standard_Boolean BRepBuilderAPI_Sewing::MergedNearestEdges(const TopoDS_Shape& e
  TopTools_MapOfShape mapEdges;
  mapEdges.Add(edge);
  for (Standard_Integer i = 1; i <= mapVert1.Extent(); i++) {
-    const TopoDS_Shape& node1 = mapVert1.FindKey(i);
+    TopoDS_Shape node1 = mapVert1.FindKey(i);
    if (!myNodeSections.IsBound(node1)) continue;
    TopTools_ListIteratorOfListOfShape ilsec(myNodeSections(node1));
    for (; ilsec.More(); ilsec.Next()) {
@@ -4453,7 +4453,7 @@ void BRepBuilderAPI_Sewing::CreateCuttingNodes(const TopTools_IndexedMapOfShape&
      if (jdist < 0.0) {
        // Bind new cutting node (end vertex only)
        seqDist.SetValue(indexMin,disProj);
-        const TopoDS_Shape& cvertex = seqVert.Value(indexMin);
+        TopoDS_Shape cvertex = seqVert.Value(indexMin);
        NodeCuttingVertex.Add(node,cvertex);
      }
      else {
--- a/src/BRepCheck/BRepCheck_Face.cxx
+++ b/src/BRepCheck/BRepCheck_Face.cxx
@@ -625,7 +625,7 @@ static Standard_Boolean Intersect(const TopoDS_Wire& wir1,
    MapW1.Add( exp1.Current() );
  for (exp2.Init( wir2, TopAbs_VERTEX ); exp2.More(); exp2.Next())
    {
-      const TopoDS_Shape& V = exp2.Current();
+      TopoDS_Shape V = exp2.Current();
      if (MapW1.Contains( V ))
 	CommonVertices.Append( V );
    }
--- a/src/BRepClass/BRepClass_Intersector.cxx
+++ b/src/BRepClass/BRepClass_Intersector.cxx
@@ -248,6 +248,7 @@ void CheckSkip(Geom2dInt_GInter& theInter,
  {
    return;
  }
+  const TopoDS_Edge anEl = theE.NextEdge(); // the next edge
  if (!(BRep_Tool::Tolerance(aVl) > theMaxTol) || theE.NextEdge().IsNull())
  {
    return;
--- a/src/BRepClass3d/BRepClass3d_SClassifier.cxx
+++ b/src/BRepClass3d/BRepClass3d_SClassifier.cxx
@@ -46,7 +46,7 @@ static

 //gets transition of line <L> passing through/near the edge <e> of faces <f1>, <f2>. <param> is
 // a parameter on the edge where the minimum distance between <l> and <e> was found
-static Standard_Integer GetTransi(const TopoDS_Face& f1, const TopoDS_Face& f2, const TopoDS_Edge& e,
+static Standard_Integer GetTransi(const TopoDS_Face& f1, const TopoDS_Face& f2, const TopoDS_Edge e,
                     Standard_Real param, const gp_Lin& L, IntCurveSurface_TransitionOnCurve& trans);

 static Standard_Boolean GetNormalOnFaceBound(const TopoDS_Edge& E, const TopoDS_Face& F, Standard_Real param, gp_Dir& OutDir);
@@ -607,7 +607,7 @@ static Standard_Boolean GetNormalOnFaceBound(const TopoDS_Edge& E,
 //=======================================================================
 static Standard_Integer GetTransi(const TopoDS_Face& f1,
                                  const TopoDS_Face& f2,
-                                  const TopoDS_Edge& e,
+                                  const TopoDS_Edge e,
                                  const Standard_Real param,
                                  const gp_Lin& L,
                                  IntCurveSurface_TransitionOnCurve& trans)
--- a/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
+++ b/src/BRepExtrema/BRepExtrema_DistShapeShape.cxx
@@ -65,8 +65,8 @@ namespace
    }
  }

-  inline Standard_Real DistanceInitiale(const TopoDS_Vertex& V1,
-                                        const TopoDS_Vertex& V2)
+  inline Standard_Real DistanceInitiale(const TopoDS_Vertex V1,
+                                        const TopoDS_Vertex V2)
  {
    return (BRep_Tool::Pnt(V1).Distance(BRep_Tool::Pnt(V2)));
  }
--- a/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
+++ b/src/BRepExtrema/BRepExtrema_DistanceSS.cxx
@@ -468,14 +468,7 @@ static void PERFORM_C0(const TopoDS_Edge& S1, const TopoDS_Edge& S2,
              if (fabs(Dstmin - sqrt(Ext.SquareDistance(ii))) < Eps)
              {
                Pt = Ext.Point(ii);
-                // Pt - point on the curve pCurvOther/Eother, but
-                // if iE == 0 -> Eother correspond to edge S2
-                // and to edge S1 in the opposite case.
-                // Therefore we should search Pt through previous solution points on Other curve (edge):
-                // if iE == 0 - on edge S2, namely through SeqSol2,
-                // else       - on edge S1, namely through SeqSol1.
-                const bool triSolutionResult = (iE == 0) ? TRI_SOLUTION(SeqSol2, Pt) : TRI_SOLUTION(SeqSol1, Pt);
-                if (triSolutionResult)
+                if (TRI_SOLUTION(SeqSol2, Pt))
                {
                  // Check if the parameter does not correspond to a vertex
                  const Standard_Real t = Ext.Parameter(ii);
@@ -876,19 +869,9 @@ void BRepExtrema_DistanceSS::Perform (const TopoDS_Edge& theS1,

  if (!seqSol1.IsEmpty() && !seqSol2.IsEmpty())
  {
-    BRepExtrema_SeqOfSolution::iterator anIt1 = seqSol1.begin();
-    BRepExtrema_SeqOfSolution::iterator anIt2 = seqSol2.begin();
-    for (; anIt1 != seqSol1.end() && anIt2 != seqSol2.end(); anIt1++, anIt2++)
-    {
-      gp_Pnt Pt1 = anIt1->Point();
-      gp_Pnt Pt2 = anIt2->Point();
-      if (TRI_SOLUTION(theSeqSolShape1, Pt1) || TRI_SOLUTION(theSeqSolShape2, Pt2))
-      {
-        theSeqSolShape1.Append(*anIt1);
-        theSeqSolShape2.Append(*anIt2);
-        myModif = Standard_True;
-      }
-    }
+    theSeqSolShape1.Append(seqSol1);
+    theSeqSolShape2.Append(seqSol2);
+    myModif = Standard_True;
  }
 }

--- a/src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityDistTool.cxx
@@ -1,517 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <BRepExtrema_ProximityDistTool.hxx>
-
-#include <BRepAdaptor_Surface.hxx>
-#include <BRep_Tool.hxx>
-#include <gp_Pln.hxx>
-#include <Precision.hxx>
-#include <Poly_Connect.hxx>
-#include <Standard_NullValue.hxx>
-#include <TopoDS.hxx>
-
-//=======================================================================
-//function : BRepExtrema_ProximityDistTool
-//purpose  : Creates new unitialized tool
-//=======================================================================
-BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool()
-: myMinDistance (std::numeric_limits<Standard_Real>::max()),
-  myProxDist (-1.),
-  myPntStatus1 (ProxPnt_Status_UNKNOWN),
-  myPntStatus2 (ProxPnt_Status_UNKNOWN),
-  myNbSamples1 (0),
-  myProxVtxIdx1 (-1)
-{
-}
-
-//=======================================================================
-//function : BRepExtrema_ProximityDistTool
-//purpose  : Creates new tool for the given element sets
-//=======================================================================
-BRepExtrema_ProximityDistTool::BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                              const Standard_Integer theNbSamples1,
-                                                              const BVH_Array3d& theAddVertices1,
-                                                              const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
-                                                              const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                              const BRepExtrema_ShapeList& theShapeList1,
-                                                              const BRepExtrema_ShapeList& theShapeList2)
-: myMinDistance (std::numeric_limits<Standard_Real>::max()),
-  myProxDist (-1.),
-  myPntStatus1 (ProxPnt_Status_UNKNOWN),
-  myPntStatus2 (ProxPnt_Status_UNKNOWN),
-  myNbSamples1 (theNbSamples1),
-  myProxVtxIdx1 (-1)
-{
-  LoadTriangleSets (theSet1, theSet2);
-  LoadShapeLists (theShapeList1, theShapeList2);
-  LoadAdditionalPointsFirstSet (theAddVertices1, theAddStatus1);
-}
-
-//=======================================================================
-//function : LoadTriangleSets
-//purpose  : Loads the given element sets into the tool
-//=======================================================================
-void BRepExtrema_ProximityDistTool::LoadTriangleSets (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                      const Handle(BRepExtrema_TriangleSet)& theSet2)
-{
-  mySet1 = theSet1;
-  mySet2 = theSet2;
-}
-
-//=======================================================================
-//function : LoadShapeLists
-//purpose  : Loads the given list of subshapes into the proximity tool
-//=======================================================================
-void BRepExtrema_ProximityDistTool::LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                                    const BRepExtrema_ShapeList& theShapeList2)
-{
-  myShapeList1 = theShapeList1;
-  myShapeList2 = theShapeList2;
-}
-
-//=======================================================================
-//function : LoadAdditionalPointsFirstSet
-//purpose  : Loads given additional vertices and their statuses
-//=======================================================================
-void BRepExtrema_ProximityDistTool::LoadAdditionalPointsFirstSet (const BVH_Array3d& theAddVertices1,
-                                                                  const NCollection_Vector<ProxPnt_Status>& theAddStatus1)
-{
-  myAddVertices1 = theAddVertices1;
-  myAddStatus1 = theAddStatus1;
-}
-
-//=======================================================================
-//function : goThroughtSet1
-//purpose  : Goes throught vertices from the 1st set
-//=======================================================================
-void BRepExtrema_ProximityDistTool::goThroughtSet1 (const BVH_Array3d& theVertices1,
-                                                    const Standard_Boolean theIsAdditionalSet)
-{
-  Standard_Integer aVtxSize = (Standard_Integer)theVertices1.size();
-  Standard_Integer aVtxStep = Max (myNbSamples1 <= 0 ? 1 : aVtxSize / myNbSamples1, 1);
-  for (Standard_Integer aVtxIdx = 0; aVtxIdx < aVtxSize; aVtxIdx += aVtxStep)
-  {
-    myDistance = std::numeric_limits<Standard_Real>::max();
-    myMinDistance = std::numeric_limits<Standard_Real>::max();
-    myIsDone = Standard_False;
-    SetObject (theVertices1[aVtxIdx]);
-
-    ComputeDistance();
-
-    if (!IsDone() && myProxDist < 0.) return;
-
-    if (IsDone() && myDistance > myProxDist)
-    {
-      myPnt1 = theVertices1[aVtxIdx];
-      myPnt2 = myExtremaPoint;
-      myProxDist = myDistance;
-      myProxVtxIdx1 = aVtxIdx;
-      myIsProxVtx1FromAddSet = theIsAdditionalSet;
-      myProxPrjState = myExtPrjState;
-    }
-  }
-}
-
-//=======================================================================
-//function : Perform
-//purpose  : Performs searching of the proximity distance
-//=======================================================================
-void BRepExtrema_ProximityDistTool::Perform()
-{
-  SetBVHSet (mySet2.get());
-  goThroughtSet1 (mySet1->GetVertices(), Standard_False);
-  goThroughtSet1 (myAddVertices1, Standard_True);
-
-  myIsDone = myProxDist > -1.;
-  if (myIsDone)
-  {
-    DefineStatusProxPnt();
-  }
-}
-
-static Standard_Real pointBoxSquareMaxDistance (const BVH_Vec3d& thePoint,
-                                                const BVH_Vec3d& theCMin,
-                                                const BVH_Vec3d& theCMax)
-{
-  Standard_Real aDist = 0;
-  for (int i = 0; i < 3; ++i)
-  {
-    if (thePoint[i] <= 0.5 * (theCMax[i] + theCMin[i])) { Standard_Real d = theCMax[i] - thePoint[i]; d *= d; aDist += d; }
-    else { Standard_Real d = thePoint[i] - theCMin[i]; d *= d; aDist += d; }
-  }
-  return aDist;
-}
-
-//=======================================================================
-//function : Branch rejection
-//purpose  : Defines the rules for node rejection by bounding box
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::RejectNode (const BVH_Vec3d& theCornerMin,
-                                                            const BVH_Vec3d& theCornerMax,
-                                                            Standard_Real& theMetric) const
-{
-  theMetric = sqrt (BVH_Tools<Standard_Real, 3>::PointBoxSquareDistance (myObject,
-                                                                         theCornerMin,
-                                                                         theCornerMax));
-
-  Standard_Real aMaxMetric = sqrt (pointBoxSquareMaxDistance (myObject,
-                                                              theCornerMin,
-                                                              theCornerMax));
-
-  return theMetric > myDistance || aMaxMetric < myProxDist;
-}
-
-//=======================================================================
-//function : Leaf acceptance
-//purpose  : Defines the rules for leaf acceptance
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::Accept (const Standard_Integer theTrgIdx,
-                                                        const Standard_Real&)
-{
-  BVH_Vec3d aTrgVert1;
-  BVH_Vec3d aTrgVert2;
-  BVH_Vec3d aTrgVert3;
-
-  BVH_PrjState aBVH_PrjState;
-  Standard_Integer aNumberOfFirstNode = -1;
-  Standard_Integer aNumberOfLastNode = -1;
-
-  mySet2->GetVertices (theTrgIdx, aTrgVert1, aTrgVert2, aTrgVert3);
-
-  BVH_Vec3d aNearestPnt = BVH_Tools<Standard_Real, 3>::PointTriangleProjection (myObject,
-                                                                                aTrgVert1, aTrgVert2, aTrgVert3,
-                                                                                &aBVH_PrjState,
-                                                                                &aNumberOfFirstNode, &aNumberOfLastNode);
-
-  PrjState aPrjState (theTrgIdx, aBVH_PrjState, aNumberOfFirstNode, aNumberOfLastNode);
-  BVH_Vec3d aDirect = myObject - aNearestPnt;
-  Standard_Real aSqDistance = aDirect.Dot(aDirect);
-
-  if (aSqDistance > Precision::SquareConfusion()) // point belongs to triangle
-  {
-    const BVH_Vec3d aAB = aTrgVert2 - aTrgVert1;
-
-    BVH_Vec3d aNorm;
-    if (aTrgVert2.IsEqual (aTrgVert3)) // is this degenerate triangle (= segment)
-    {
-      const BVH_Vec3d aAP = myObject - aTrgVert1;
-      aNorm = BVH_Vec3d::Cross (BVH_Vec3d::Cross (aAP, aAB), aAB);
-    }
-    else
-    {
-      const BVH_Vec3d aAC = aTrgVert3 - aTrgVert1;
-      aNorm = BVH_Vec3d::Cross (aAB, aAC);
-    }
-
-    Standard_Real aNormSqLen = aNorm.Dot (aNorm);
-
-    // check if the distance is under perpendicular
-    const BVH_Vec3d aCrossCross = BVH_Vec3d::Cross (aDirect, aNorm);
-    Standard_Real aCrossCrossSqLen = aCrossCross.Dot (aCrossCross);
-    if (aCrossCrossSqLen > Precision::SquareConfusion() * aSqDistance * aNormSqLen)
-    {
-      // the distance is not under perpendicular
-      if (myMinDistance - sqrt (aSqDistance) > Precision::Confusion())
-      {
-        myMinDistance = sqrt (aSqDistance);
-        myMinDistPoint = aNearestPnt;
-        myMinPrjState = aPrjState;
-      }
-
-      return Standard_False;
-    }
-  }
-
-  // the distance is under perpendicular
-  if (myDistance - sqrt (aSqDistance) > Precision::Confusion())
-  {
-    myDistance = sqrt (aSqDistance);
-    myExtremaPoint = aNearestPnt;
-    myExtPrjState = aPrjState;
-
-    return Standard_True;
-  }
-
-  return Standard_False;
-}
-
-//=======================================================================
-//function : ComputeDistance
-//purpose  : Computes the distance between object and BVH tree
-//=======================================================================
-Standard_Real BRepExtrema_ProximityDistTool::ComputeDistance()
-{
-  myIsDone = this->Select() > 0;
-
-  if (!myIsDone)
-  {
-    if (myMinDistance < std::numeric_limits<Standard_Real>::max())
-    {
-      myExtremaPoint = myMinDistPoint;
-      myExtPrjState = myMinPrjState;
-      myIsDone = true;
-    }
-
-    myDistance = myMinDistance;
-  }
-
-  return myDistance;
-}
-
-//=======================================================================
-//function : IsNodeOnBorder
-//purpose  : Returns true if the node is on the boarder
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::IsNodeOnBorder (const Standard_Integer theNodeIdx,
-                                                                const Handle(Poly_Triangulation)& theTr)
-{
-  Poly_Connect aPolyConnect (theTr);
-
-  Standard_Integer aContTrg; //index of triangle containing exploring node
-  for (aPolyConnect.Initialize (theNodeIdx); aPolyConnect.More(); aPolyConnect.Next())
-  {
-    aContTrg = aPolyConnect.Value();
-
-    Standard_Integer aContTrgNodes[3];
-    theTr->Triangle (aContTrg).Get (aContTrgNodes[0], aContTrgNodes[1], aContTrgNodes[2]); //indices of nodes of the triangle
-
-    Standard_Integer aAdjTrg[3];
-    aPolyConnect.Triangles (aContTrg, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
-  
-    for (Standard_Integer j = 0; j < 3; j++)
-    {
-      Standard_Integer k = (j + 1) % 3;
-      if (aAdjTrg[j] == 0) //free segment of triangle
-      {
-        //aContTrgNodes[j], aContTrgNodes[k] are ends of free segment and it is a part of border
-        if (aContTrgNodes[j] == theNodeIdx || aContTrgNodes[k] == theNodeIdx)
-        {
-          return Standard_True;
-        }
-      }
-    }
-  }
-
-  return Standard_False;
-}
-
-//=======================================================================
-//function : IsEdgeOnBorder
-//purpose  : Returns true if the edge is on the boarder
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityDistTool::IsEdgeOnBorder (const Standard_Integer theTrgIdx,
-                                                                const Standard_Integer theFirstEdgeNodeIdx,
-                                                                const Standard_Integer theSecondEdgeNodeIdx,
-                                                                const Handle(Poly_Triangulation)& theTr)
-{
-  Poly_Connect aPolyConnect (theTr);
-
-  Standard_Integer aAdjTrg[3];
-  aPolyConnect.Triangles (theTrgIdx, aAdjTrg[0], aAdjTrg[1], aAdjTrg[2]); //indices of adjacent triangles
-
-  for (Standard_Integer j = 0; j < 3; j++)
-  {
-    Standard_Integer k = (j + 1) % 3;
-    if (aAdjTrg[j] == 0) //free segment of triangle
-    {
-      //are ends of free segment and it is a part of border
-      if (j == theFirstEdgeNodeIdx &&
-          k == theSecondEdgeNodeIdx)
-      {
-        return Standard_True;
-      }
-    }
-  }
-
-  return Standard_False;
-}
-
-//=======================================================================
-//function : defineStatusProxPnt1
-//purpose  : Defines the status of proximity point from 1st BVH
-//=======================================================================
-void BRepExtrema_ProximityDistTool::defineStatusProxPnt1()
-{
-  if (myIsProxVtx1FromAddSet)
-  {
-    myPntStatus1 = myAddStatus1[myProxVtxIdx1];
-    return;
-  }
-
-  Standard_Integer aFaceID1 = mySet1->GetShapeIDOfVtx (myProxVtxIdx1);
-
-  if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_EDGE)
-  {
-    const BVH_Array3d& aVertices1 = mySet1->GetVertices();
-    Standard_Integer aVtxSize = (Standard_Integer)aVertices1.size();
-    Standard_Integer aLastIdx = aVtxSize - 1;
-
-    if ((aVertices1[0] - aVertices1[aLastIdx]).Modulus() < Precision::Confusion()) // if closed
-    {
-      myPntStatus1 = ProxPnt_Status_MIDDLE;
-      return;
-    }
-
-    if (myProxVtxIdx1 == 0 || myProxVtxIdx1 == aLastIdx)
-    {
-      myPntStatus1 = ProxPnt_Status_BORDER;
-    }
-    else
-    {
-      myPntStatus1 = ProxPnt_Status_MIDDLE;
-    }
-  }
-  else if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_FACE)
-  {
-    Standard_Integer aNodeIdx = mySet1->GetVtxIdxInShape (myProxVtxIdx1) + 1;
-
-    TopLoc_Location aLocation;
-    const TopoDS_Face& aF = TopoDS::Face (myShapeList1 (aFaceID1));
-    Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
-
-    if (IsNodeOnBorder (aNodeIdx, aTr))
-    {
-      myPntStatus1 = ProxPnt_Status_BORDER;
-    }
-    else
-    {
-      myPntStatus1 = ProxPnt_Status_MIDDLE;
-    }
-  }
-}
-
-//=======================================================================
-//function : defineStatusProxPnt2
-//purpose  : Defines the status of proximity point from 2nd BVH
-//=======================================================================
-void BRepExtrema_ProximityDistTool::defineStatusProxPnt2()
-{
-  Standard_Integer aTrgIdx = myProxPrjState.GetTrgIdx();
-  Standard_Integer aFaceID2 = mySet2->GetFaceID (aTrgIdx);
-
-  if (myShapeList2 (aFaceID2).ShapeType() == TopAbs_EDGE)
-  {
-    if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_INNER)
-    {
-      return;
-    }
-    else
-    {
-      const BVH_Array3d& aVertices2 = mySet2->GetVertices();
-      Standard_Integer aVtxSize = (Standard_Integer)aVertices2.size();
-      Standard_Integer aLastIdx = aVtxSize - 1;
-
-      if ((aVertices2[0] - aVertices2[aLastIdx]).Modulus() < Precision::Confusion()) // if closed
-      {
-        myPntStatus2 = ProxPnt_Status_MIDDLE;
-        return;
-      }
-
-      NCollection_Array1<Standard_Integer> aVtxIndicesOfTrg;
-      mySet2->GetVtxIndices (aTrgIdx, aVtxIndicesOfTrg);
-
-      Standard_Integer aFirstNodeNum = myProxPrjState.GetNumberOfFirstNode();
-      Standard_Integer aFirstVtxIdx = aVtxIndicesOfTrg[aFirstNodeNum];
-
-      if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_VERTEX)
-      {
-        if (aFirstVtxIdx == 0 || aFirstVtxIdx == aLastIdx)
-        {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
-        }
-      }
-      else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
-      {
-        Standard_Integer aLastNodeNum = myProxPrjState.GetNumberOfLastNode();
-        Standard_Integer aLastVtxIdx = aVtxIndicesOfTrg[aLastNodeNum];
-
-        // it could be border only in case projection is on a degenerated edge
-        if (aFirstVtxIdx == aLastVtxIdx && (aFirstVtxIdx == 0 || aFirstVtxIdx == aLastIdx))
-        {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
-        }
-      }
-    }
-  }
-  else if (myShapeList2 (aFaceID2).ShapeType() == TopAbs_FACE)
-  {
-    if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_INNER)
-    {
-      myPntStatus2 = ProxPnt_Status_MIDDLE;
-    }
-    else
-    {
-      TopLoc_Location aLocation;
-      const TopoDS_Face& aF = TopoDS::Face (myShapeList2 (aFaceID2));
-      Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (aF, aLocation);
-
-      NCollection_Array1<Standard_Integer> aVtxIndicesOfTrg;
-      mySet2->GetVtxIndices (aTrgIdx, aVtxIndicesOfTrg);
-
-      if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_VERTEX)
-      {
-        Standard_Integer aNodeNum = myProxPrjState.GetNumberOfFirstNode();
-        Standard_Integer aNodeIdx = mySet2->GetVtxIdxInShape (aVtxIndicesOfTrg[aNodeNum]) + 1;
-
-        if (IsNodeOnBorder (aNodeIdx, aTr))
-        {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
-        }
-      }
-      else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
-      {
-        Standard_Integer aTrgIdxInShape = mySet2->GetTrgIdxInShape (aTrgIdx) + 1;
-
-        if (IsEdgeOnBorder (aTrgIdxInShape,
-                            myProxPrjState.GetNumberOfFirstNode(),
-                            myProxPrjState.GetNumberOfLastNode(),
-                            aTr))
-        {
-          myPntStatus2 = ProxPnt_Status_BORDER;
-        }
-        else
-        {
-          myPntStatus2 = ProxPnt_Status_MIDDLE;
-        }
-      } //else if (myProxPrjState.GetPrjState() == BVH_PrjState::BVH_PrjStateInTriangle_EDGE)
-    }
-  } //else if (myShapeList1 (aFaceID1).ShapeType() == TopAbs_FACE)
-}
-
-//=======================================================================
-//function : DefineStatusProxPnt
-//purpose  : Defines the status of proximity points
-//=======================================================================
-void BRepExtrema_ProximityDistTool::DefineStatusProxPnt()
-{
-  // define the status of proximity point from 1st BVH
-  defineStatusProxPnt1();
-
-  // define the status of proximity point from 2nd BVH
-  defineStatusProxPnt2();
-}
--- a/src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityDistTool.hxx
@@ -1,230 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _BRepExtrema_ProximityDistTool_HeaderFile
-#define _BRepExtrema_ProximityDistTool_HeaderFile
-
-#include <BRepExtrema_ElementFilter.hxx>
-#include <BRepExtrema_MapOfIntegerPackedMapOfInteger.hxx>
-#include <BRepExtrema_TriangleSet.hxx>
-#include <BVH_Distance.hxx>
-#include <BVH_Tools.hxx>
-#include <Poly_Triangulation.hxx>
-
-//! Tool class for computation the proximity distance from first 
-//! primitive set to second one that is the maximal from minimum 
-//! perpendicular distances. If no perpendicular distance is found, the 
-//! minimum distance will be returned.
-//! This tool is not intended to be used independently, and is integrated
-//! in other classes, implementing algorithms based on shape tessellation
-//! (BRepExtrema_ProximityValueTool).
-//! 
-//! Please note that algorithm results are approximate and depend greatly
-//! on the quality of input tessellation(s).
-class BRepExtrema_ProximityDistTool : public BVH_Distance <Standard_Real, 3, BVH_Vec3d, 
-                                                           BRepExtrema_TriangleSet>
-{
-public:
-
-  typedef typename BVH_Tools<Standard_Real, 3>::BVH_PrjStateInTriangle BVH_PrjState;
-
-  enum ProxPnt_Status
-  {
-    ProxPnt_Status_BORDER,
-    ProxPnt_Status_MIDDLE,
-    ProxPnt_Status_UNKNOWN
-  };
-
-public:
-
-  //! Struct with information about projection point state from 2nd BVH,
-  //! providing proximity point of 2nd shape
-  struct PrjState
-  {
-    PrjState()
-    : myTrgIdx (0),
-      myPrjState (BVH_PrjState::BVH_PrjStateInTriangle_INNER),
-      myNumberOfFirstNode (0),
-      myNumberOfLastNode (0)
-    {}
-
-    PrjState (const Standard_Integer theTrgIdx,
-              const BVH_PrjState     thePrjState,
-              const Standard_Integer theNumberOfFirstNode,
-              const Standard_Integer theNumberOfLastNode)
-    : myTrgIdx (theTrgIdx),
-      myPrjState (thePrjState),
-      myNumberOfFirstNode (theNumberOfFirstNode),
-      myNumberOfLastNode (theNumberOfLastNode)
-    {}
-
-    Standard_Integer GetTrgIdx() const { return myTrgIdx; }
-
-    BVH_PrjState GetPrjState() const { return myPrjState; }
-
-    Standard_Integer GetNumberOfFirstNode() const { return myNumberOfFirstNode; }
-
-    Standard_Integer GetNumberOfLastNode() const { return myNumberOfLastNode; }
-
-  private:
-
-    Standard_Integer myTrgIdx; //!< Index of triangle on which the projection is located
-    BVH_PrjState myPrjState; //!< Position of a projection on the triangle (vertex, edge, inner)
-    Standard_Integer myNumberOfFirstNode; //!< The 1st vtx of the triangle edge on which the projection is located
-    Standard_Integer myNumberOfLastNode; //!< The 2nd vtx of the triangle edge on which the projection is located
-  };
-
-public:
-
-  //! Creates new unitialized tool.
-  Standard_EXPORT BRepExtrema_ProximityDistTool();
-
-  //! Creates new tool for the given element sets.
-  Standard_EXPORT BRepExtrema_ProximityDistTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                 const Standard_Integer theNbSamples1,
-                                                 const BVH_Array3d& theAddVertices1,
-                                                 const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
-                                                 const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                 const BRepExtrema_ShapeList& theShapeList1,
-                                                 const BRepExtrema_ShapeList& theShapeList2);
-
-public:
-
-  //! Loads the given element sets into the tool.
-  Standard_EXPORT void LoadTriangleSets (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                         const Handle(BRepExtrema_TriangleSet)& theSet2);
-
-  //! Loads the given list of subshapes into the tool.
-  Standard_EXPORT void LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                       const BRepExtrema_ShapeList& theShapeList2);
-
-  //! Loads given additional vertices and their statuses.
-  void LoadAdditionalPointsFirstSet (const BVH_Array3d& theAddVertices1,
-                                     const NCollection_Vector<ProxPnt_Status>& theAddStatus1);
-
-  //! Performs searching of the proximity distance.
-  Standard_EXPORT void Perform();
-
-public: //! @name Reject/Accept implementations
-
-  //! Defines the rules for node rejection by bounding box.
-  Standard_EXPORT virtual Standard_Boolean RejectNode (const BVH_Vec3d& theCornerMin,
-                                                       const BVH_Vec3d& theCornerMax,
-                                                       Standard_Real& theMetric) const Standard_OVERRIDE;
-
-  //! Defines the rules for leaf acceptance.
-  Standard_EXPORT virtual Standard_Boolean Accept (const Standard_Integer theSgmIdx,
-                                                   const Standard_Real&) Standard_OVERRIDE;
-
-public:
-
-  //! Returns true if the node is on the boarder.
-  Standard_EXPORT static Standard_Boolean IsNodeOnBorder (const Standard_Integer theNodeIdx,
-                                                          const Handle (Poly_Triangulation)& theTr);
-
-  //! Returns true if the edge is on the boarder.
-  Standard_EXPORT static Standard_Boolean IsEdgeOnBorder (const Standard_Integer theTrgIdx,
-                                                          const Standard_Integer theFirstEdgeNodeIdx,
-                                                          const Standard_Integer theSecondEdgeNodeIdx,
-                                                          const Handle (Poly_Triangulation)& theTr);
-
-public:
-
-  //! Returns points on triangles sets, which provide the proximity distance.
-  void ProximityPoints (BVH_Vec3d& thePoint1, BVH_Vec3d& thePoint2) const
-  {
-    thePoint1 = myPnt1;
-    thePoint2 = myPnt2;
-  }
-
-  //! Returns status of points on triangles sets, which provide the proximity distance.
-  void ProximityPointsStatus (ProxPnt_Status& thePointStatus1, ProxPnt_Status& thePointStatus2) const
-  {
-    thePointStatus1 = myPntStatus1;
-    thePointStatus2 = myPntStatus2;
-  }
-
-  //! Returns the computed distance
-  Standard_Real ProximityDistance() const { return myProxDist; }
-
-protected:
-
-  //! Computes the distance between object and BVH tree.
-  Standard_EXPORT Standard_Real ComputeDistance();
-
-  //! Defines the status of proximity points.
-  Standard_EXPORT void DefineStatusProxPnt();
-
-private:
-
-  //! Goes throught vertices from the 1st set.
-  void goThroughtSet1 (const BVH_Array3d& aVertices1,
-                       const Standard_Boolean theIsAdditionalSet);
-
-  //! Defines the status of proximity point from 1st BVH.
-  void defineStatusProxPnt1();
-
-  //! Defines the status of proximity point from 2nd BVH.
-  void defineStatusProxPnt2();
-
-protected:
-
-  Standard_Real myMinDistance; //!< Minimal distance from point to BVH, could be not equal to myDistance
-  BVH_Vec3d myMinDistPoint; //!< Point on BVH providing the minimal distance
-
-  BVH_Vec3d myExtremaPoint; //!< Point on BVH providing the extrema
-
-  Standard_Real myProxDist; //!< Proximity distance
-
-  //! Proximity points
-  BVH_Vec3d myPnt1, myPnt2;
-
-  //! Proximity points' status
-  ProxPnt_Status myPntStatus1, myPntStatus2;
-
-private:
-
-  //! Set of all mesh elements (triangles) of the 1st shape.
-  Handle(BRepExtrema_TriangleSet) mySet1;
-  //! Set of all mesh elements (triangles) of the 2nd shape.
-  Handle(BRepExtrema_TriangleSet) mySet2;
-
-  //! List of subshapes of the 1st shape.
-  BRepExtrema_ShapeList myShapeList1;
-  //! List of subshapes of the 2nd shape.
-  BRepExtrema_ShapeList myShapeList2;
-
-  Standard_Integer myNbSamples1; //!< Number of samples points on the first shape
-
-  //! Is vertex corresponding to proximity point of 1st shape from additional set
-  Standard_Integer myIsProxVtx1FromAddSet;
-  BVH_Array3d myAddVertices1; //!< Additional vertices on the 1st shape
-  NCollection_Vector<ProxPnt_Status> myAddStatus1; //!< Status of additional vertices on the 1st shape
-
-  //! Vertex index from 1st BVH corresponding to proximity point of 1st shape
-  Standard_Integer myProxVtxIdx1;
-
-  //! Information of projection point state from 2nd BVH providing proximity point of 2nd shape
-  PrjState myProxPrjState;
-
-  //! Information of projection point state from 2nd BVH providing the extrema
-  PrjState myExtPrjState;
-
-  //! Information of projection point state from 2nd BVH providing the minimal distance
-  PrjState myMinPrjState;
-
-};
-
-#endif // _BRepExtrema_ProximityDistTool_HeaderFile
--- a/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityValueTool.cxx
@@ -1,587 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <BRepExtrema_ProximityValueTool.hxx>
-#include <BRepExtrema_ProximityDistTool.hxx>
-
-#include <BRep_Tool.hxx>
-#include <BRepAdaptor_Curve.hxx>
-#include <BRepGProp.hxx>
-#include <GCPnts_AbscissaPoint.hxx>
-#include <GCPnts_QuasiUniformAbscissa.hxx>
-#include <GProp_GProps.hxx> 
-#include <Poly_Connect.hxx>
-#include <TopoDS.hxx>
-
-//=======================================================================
-//function : BRepExtrema_ProximityValueTool
-//purpose  : Creates new unitialized proximity tool
-//=======================================================================
-BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool()
-: myIsRefinementRequired1 (Standard_False),
-  myIsRefinementRequired2 (Standard_False),
-  myDistance (std::numeric_limits<Standard_Real>::max()),
-  myIsDone (Standard_False),
-  myNbSamples1(0),
-  myNbSamples2(0)
-{
-  // Should be initialized later
-  myIsInitS1 = myIsInitS2 = Standard_False;
-}
-
-//=======================================================================
-//function : BRepExtrema_ProximityValueTool
-//purpose  : Creates new proximity tool for the given element sets
-//=======================================================================
-BRepExtrema_ProximityValueTool::BRepExtrema_ProximityValueTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                                const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                                const BRepExtrema_ShapeList& theShapeList1,
-                                                                const BRepExtrema_ShapeList& theShapeList2)
-: myIsRefinementRequired1 (Standard_False),
-  myIsRefinementRequired2 (Standard_False),
-  myDistance (std::numeric_limits<Standard_Real>::max()),
-  myIsDone (Standard_False),
-  myNbSamples1 (0),
-  myNbSamples2 (0)
-{
-  LoadShapeLists (theShapeList1, theShapeList2);
-  LoadTriangleSets (theSet1, theSet2);
-}
-
-//=======================================================================
-//function : LoadTriangleSets
-//purpose  : Loads the given element sets into the proximity tool
-//=======================================================================
-void BRepExtrema_ProximityValueTool::LoadTriangleSets (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                       const Handle(BRepExtrema_TriangleSet)& theSet2)
-{
-  mySet1 = theSet1;
-  mySet2 = theSet2;
-
-  MarkDirty();
-}
-
-//=======================================================================
-//function : calcEdgeRefinementStep
-//purpose  : Calculates the edge refinement step
-//=======================================================================
-static Standard_Real calcEdgeRefinementStep (const TopoDS_Edge& theEdge,
-                                             const Standard_Integer theNbNodes)
-{
-  if (theNbNodes < 2)
-    return 0;
-
-  BRepAdaptor_Curve aBAC (theEdge);
-  Standard_Real aLen = GCPnts_AbscissaPoint::Length (aBAC);
-  return aLen / (Standard_Real)(theNbNodes - 1);
-}
-
-//=======================================================================
-//function : calcFaceRefinementStep
-//purpose  : Calculates the face refinement step as an approximate square
-// (Shape area / number triangles) * 2
-//=======================================================================
-static Standard_Real calcFaceRefinementStep (const TopoDS_Face& theFace,
-                                             const Standard_Integer theNbTrg)
-{
-  if (theNbTrg < 1)
-    return 0;
-
-  GProp_GProps props;
-  BRepGProp::SurfaceProperties (theFace, props);
-  Standard_Real aArea = props.Mass();
-  return 2 * (aArea / (Standard_Real)theNbTrg);
-}
-
-//=======================================================================
-//function : getInfoForRefinement
-//purpose  : Gets shape data for further refinement
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getInfoForRefinement (const TopoDS_Shape& theShape,
-                                                                       TopAbs_ShapeEnum& theShapeType,
-                                                                       Standard_Integer& theNbNodes,
-                                                                       Standard_Real& theStep)
-{
-  if (theShape.ShapeType() == TopAbs_FACE)
-  {
-    theShapeType = TopAbs_FACE;
-    TopoDS_Face aF = TopoDS::Face (theShape);
-
-    TopLoc_Location aLocation;
-    Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (aF, aLocation);
-
-    if (aTriangulation.IsNull())
-    {
-      return Standard_False;
-    }
-
-    theNbNodes = aTriangulation->NbNodes();
-    Standard_Integer aNbTrg = aTriangulation->NbTriangles();
-    theStep = calcFaceRefinementStep (aF, aNbTrg);
-  }
-  else if (theShape.ShapeType() == TopAbs_EDGE)
-  {
-    theShapeType = TopAbs_EDGE;
-    TopoDS_Edge aE = TopoDS::Edge (theShape);
-
-    TopLoc_Location aLocation;
-    Handle(Poly_Polygon3D) aPolygon = BRep_Tool::Polygon3D (aE, aLocation);
-
-    if (aPolygon.IsNull())
-    {
-      return Standard_False;
-    }
-
-    theNbNodes = aPolygon->NbNodes();
-    theStep = calcEdgeRefinementStep (aE, theNbNodes);
-  }
-  else
-  {
-    return Standard_False;
-  }
-
-  if (theStep < Precision::Confusion())
-  {
-    return Standard_False;
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : LoadTriangleSets
-//purpose  : Loads the given list of subshapes into the proximity tool
-//=======================================================================
-void BRepExtrema_ProximityValueTool::LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                                     const BRepExtrema_ShapeList& theShapeList2)
-{
-  myShapeList1 = theShapeList1;
-  myShapeList2 = theShapeList2;
-
-  myShape1 = theShapeList1 (0);
-  myIsInitS1 = getInfoForRefinement (myShape1, myShapeType1, myNbNodes1, myStep1);
-
-  myShape2 = theShapeList2 (0);
-  myIsInitS2 = getInfoForRefinement (myShape2, myShapeType2, myNbNodes2, myStep2);
-
-  MarkDirty();
-}
-
-//=======================================================================
-//function : SetNbSamplePoints
-//purpose  : Sets number of sample points used for proximity calculation for each shape
-//=======================================================================
-void BRepExtrema_ProximityValueTool::SetNbSamplePoints(const Standard_Integer theSamples1,
-                                                       const Standard_Integer theSamples2)
-{
-  myNbSamples1 = theSamples1;
-  myNbSamples2 = theSamples2;
-
-  MarkDirty();
-}
-
-//=======================================================================
-//function : computeProximityValue
-//purpose  : Returns the computed proximity value from first BVH to another one
-//=======================================================================
-Standard_Real BRepExtrema_ProximityValueTool::computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                                    const Standard_Integer theNbSamples1,
-                                                                    const BVH_Array3d& theAddVertices1,
-                                                                    const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
-                                                                    const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                                    const BRepExtrema_ShapeList& theShapeList1,
-                                                                    const BRepExtrema_ShapeList& theShapeList2,
-                                                                    BVH_Vec3d& thePoint1,
-                                                                    BVH_Vec3d& thePoint2,
-                                                                    ProxPnt_Status& thePointStatus1,
-                                                                    ProxPnt_Status& thePointStatus2) const
-{
-  BRepExtrema_ProximityDistTool aProxDistTool (theSet1, theNbSamples1, theAddVertices1, theAddStatus1,
-                                               theSet2, theShapeList1, theShapeList2);
-  aProxDistTool.Perform();
-
-  if (!aProxDistTool.IsDone())
-    return -1.;
-
-  aProxDistTool.ProximityPoints (thePoint1, thePoint2);
-  aProxDistTool.ProximityPointsStatus (thePointStatus1, thePointStatus2);
-
-  return aProxDistTool.ProximityDistance();
-}
-
-//=======================================================================
-//function : getEdgeAdditionalVertices
-//purpose  : Gets additional vertices and their statuses on the edge with the input step
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getEdgeAdditionalVertices (
-  const TopoDS_Edge& theEdge,
-  const Standard_Real theStep,
-  BVH_Array3d& theAddVertices,
-  NCollection_Vector<ProxPnt_Status>& theAddStatuses)
-{
-  BRepAdaptor_Curve aBAC (theEdge);
-  
-  if (!aBAC.Is3DCurve() || theStep < Precision::Confusion())
-  {
-    return Standard_False;
-  }
-
-  Standard_Real aLen = GCPnts_AbscissaPoint::Length (aBAC);
-  Standard_Integer aNbSamplePoints = (Standard_Integer) (aLen / theStep) + 1;
-
-  GCPnts_QuasiUniformAbscissa aGCPnts (aBAC, Max (3, aNbSamplePoints));
-
-  if (!aGCPnts.IsDone())
-    return Standard_False;
-
-  Standard_Integer aNbNodes = aGCPnts.NbPoints();
-  for (Standard_Integer aVertIdx = 2; aVertIdx < aNbNodes; ++aVertIdx) //don't add extreme points
-  {
-    Standard_Real aPar = aGCPnts.Parameter (aVertIdx);
-    gp_Pnt aP = aBAC.Value (aPar);
-
-    theAddVertices.push_back (BVH_Vec3d (aP.X(), aP.Y(), aP.Z()));
-    theAddStatuses.Append (ProxPnt_Status::ProxPnt_Status_MIDDLE);
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : doRecurTrgSplit
-//purpose  : Splits the triangle into two ones recursively, halving the longest side
-//           untill the area of the current triangle > input step
-//! @param theTrg points of the triangle to be splitted
-//! @param theEdgesStatus status of triangle edges - on the border or middle of the face
-//! @param theTol telerance used in search of coincidence points
-//! @param theStep minimum area of the resulting triangle
-//! @param theAddVertices vertices obtained halving sides
-//! @param theAddStatuses status of obtained vertices - on the border or middle of the face,
-//! from triangulation of which the input triangle is
-//=======================================================================
-void BRepExtrema_ProximityValueTool::doRecurTrgSplit (const gp_Pnt (&theTrg)[3],
-                                                      const ProxPnt_Status (&theEdgesStatus)[3],
-                                                      const Standard_Real theTol,
-                                                      const Standard_Real theStep,
-                                                      BVH_Array3d& theAddVertices,
-                                                      NCollection_Vector<ProxPnt_Status>& theAddStatuses)
-{
-  gp_XYZ aTrgSide1 = theTrg[1].Coord() - theTrg[0].Coord();
-  gp_XYZ aTrgSide2 = theTrg[2].Coord() - theTrg[0].Coord();
-  Standard_Real aTrgArea = 0.5 * aTrgSide1.CrossMagnitude (aTrgSide2);
-
-  if (aTrgArea - theStep < Precision::SquareConfusion())
-    return;
-
-  Standard_Real aD[3] { theTrg[0].Distance (theTrg[1]),
-                        theTrg[1].Distance (theTrg[2]),
-                        theTrg[2].Distance (theTrg[0]) };
-  Standard_Integer aBisectedEdgeIdx = aD[0] > aD[1] ? (aD[0] > aD[2] ? 0 : 2) : (aD[1] > aD[2] ? 1 : 2);
-  gp_Pnt aCenterOfMaxSide (theTrg[aBisectedEdgeIdx].Coord());
-  aCenterOfMaxSide.BaryCenter (0.5, theTrg[(aBisectedEdgeIdx + 1) % 3], 0.5);
-
-  Bnd_Box aBox;
-  aBox.Add (aCenterOfMaxSide);
-  aBox.Enlarge (theTol);
-  myInspector.SetCurrent (aCenterOfMaxSide.Coord());
-  myCells.Inspect (aBox.CornerMin().XYZ(), aBox.CornerMax().XYZ(), myInspector);
-  
-  if (myInspector.IsNeedAdd()) //is point aCenterOfMaxSide unique
-  {
-    BVH_Vec3d aBisectingPnt (aCenterOfMaxSide.X(), aCenterOfMaxSide.Y(), aCenterOfMaxSide.Z());
-    theAddVertices.push_back (aBisectingPnt);
-    theAddStatuses.Append (theEdgesStatus[aBisectedEdgeIdx]);
-    myInspector.Add (aCenterOfMaxSide.Coord());
-    myCells.Add (static_cast<BRepExtrema_VertexInspector::Target>(theAddVertices.size()),
-                 aBox.CornerMin().XYZ(), aBox.CornerMax().XYZ());
-  }
-
-  gp_Pnt aTrg1[3] = { theTrg[0], theTrg[1], theTrg[2] };
-  gp_Pnt aTrg2[3] = { theTrg[0], theTrg[1], theTrg[2] };
-  ProxPnt_Status aEdgesStatus1[3] = { theEdgesStatus[0], theEdgesStatus[1], theEdgesStatus[2] };
-  ProxPnt_Status aEdgesStatus2[3] = { theEdgesStatus[0], theEdgesStatus[1], theEdgesStatus[2] };
-  switch (aBisectedEdgeIdx)
-  {
-  case 0:
-    aTrg1[0] = aTrg2[1] = aCenterOfMaxSide;
-    aEdgesStatus1[2] = aEdgesStatus2[1] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    break;
-  case 1:
-    aTrg1[1] = aTrg2[2] = aCenterOfMaxSide;
-    aEdgesStatus1[0] = aEdgesStatus2[2] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    break;
-  case 2:
-    aTrg1[2] = aTrg2[0] = aCenterOfMaxSide;
-    aEdgesStatus1[1] = aEdgesStatus2[0] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    break;
-  }
-
-  doRecurTrgSplit (aTrg1, aEdgesStatus1, theTol, theStep, theAddVertices, theAddStatuses);
-  doRecurTrgSplit (aTrg2, aEdgesStatus2, theTol, theStep, theAddVertices, theAddStatuses);
-}
-
-static Standard_Real getModelRange (const TopLoc_Location& theLocation,
-                                    const Handle(Poly_Triangulation)& theTr)
-{
-  Bnd_Box aBox;
-  theTr->MinMax (aBox, theLocation.Transformation());
-  Standard_Real aXm = 0.0, aYm = 0.0, aZm = 0.0, aXM = 0.0, aYM = 0.0, aZM = 0.0;
-  aBox.Get (aXm, aYm, aZm, aXM, aYM, aZM);
-  Standard_Real aRange = aXM - aXm;
-  aRange = Max (aRange, aYM - aYm);
-  aRange = Max (aRange, aZM - aZm);
-
-  return aRange;
-}
-
-static void getNodesOfTrg (const Standard_Integer theTriIdx,
-                           const TopLoc_Location& theLocation,
-                           const Handle (Poly_Triangulation)& theTr,
-                           gp_Pnt (&theTrg)[3])
-{
-  Standard_Integer aVtxIdx1;
-  Standard_Integer aVtxIdx2;
-  Standard_Integer aVtxIdx3;
-
-  theTr->Triangle (theTriIdx).Get (aVtxIdx1, aVtxIdx2, aVtxIdx3);
-
-  gp_Pnt aVtx1 = theTr->Node (aVtxIdx1);
-  aVtx1.Transform (theLocation);
-  theTrg[0] = aVtx1;
-
-  gp_Pnt aVtx2 = theTr->Node (aVtxIdx2);
-  aVtx2.Transform (theLocation);
-  theTrg[1] = aVtx2;
-
-  gp_Pnt aVtx3 = theTr->Node (aVtxIdx3);
-  aVtx3.Transform (theLocation);
-  theTrg[2] = aVtx3;
-}
-
-// Gets status of triangle edges - on the border or middle of the face
-static void getEdgesStatus(const Standard_Integer theTriIdx,
-                           const Handle(Poly_Triangulation)& theTr,
-                           ProxPnt_Status (&theEdgesStatus1)[3])
-{
-  for (Standard_Integer j = 0; j < 3; j++)
-  {
-    Standard_Integer k = (j + 1) % 3;
-
-    if (BRepExtrema_ProximityDistTool::IsEdgeOnBorder (theTriIdx, j, k, theTr))
-    {
-      theEdgesStatus1[j] = ProxPnt_Status::ProxPnt_Status_BORDER;
-    }
-    else
-    {
-      theEdgesStatus1[j] = ProxPnt_Status::ProxPnt_Status_MIDDLE;
-    }
-  }
-}
-
-//=======================================================================
-//function : getFaceAdditionalVertices
-//purpose  : Gets additional vertices and their statuses on the face with the input step (triangle square)
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getFaceAdditionalVertices (
-  const TopoDS_Face& theFace,
-  const Standard_Real theStep,
-  BVH_Array3d& theAddVertices,
-  NCollection_Vector<ProxPnt_Status>& theAddStatuses)
-{
-  Standard_Real aTol = Precision::Confusion();
-
-  TopLoc_Location aLocation;
-  Handle(Poly_Triangulation) aTr = BRep_Tool::Triangulation (theFace, aLocation);
-
-  if (aTr.IsNull())
-  {
-    return Standard_False;
-  }
-
-  myCells.Reset (Max (aTol, getModelRange (aLocation, aTr) / IntegerLast()));
-
-  for (Standard_Integer aTriIdx = 1; aTriIdx <= aTr->NbTriangles(); ++aTriIdx)
-  {
-    gp_Pnt aTrg[3];
-    ProxPnt_Status aEdgesStatus[3];
-    getNodesOfTrg (aTriIdx, aLocation, aTr, aTrg);
-    getEdgesStatus (aTriIdx, aTr, aEdgesStatus);
-    doRecurTrgSplit (aTrg, aEdgesStatus, aTol, theStep, theAddVertices, theAddStatuses);
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : getShapesVertices
-//purpose  : Gets additional vertices on shapes with refining a coarser one if it's needed
-//=======================================================================
-Standard_Boolean BRepExtrema_ProximityValueTool::getShapesAdditionalVertices()
-{
-  // estimate the density of meshes of shapes to add points to a coarcer one
-  // target steps for refinement
-  Standard_Real aStep1 = myStep1;
-  Standard_Real aStep2 = myStep2;
-
-  if ((myShapeType1 == TopAbs_EDGE) && (myShapeType2 == TopAbs_EDGE))
-  {
-    if (myNbSamples1 > myNbNodes1) // 1st edge needs refinement
-    {
-      aStep1 = calcEdgeRefinementStep (TopoDS::Edge (myShape1), myNbSamples1);
-      myIsRefinementRequired1 = Standard_True;
-    }
-
-    if (myNbSamples2 > myNbNodes2) // 2nd edge needs refinement
-    {
-      aStep2 = calcEdgeRefinementStep (TopoDS::Edge (myShape2), myNbSamples2);
-      myIsRefinementRequired2 = Standard_True;
-    }
-
-    if (aStep1 / aStep2 > 2.) // 1st edge needs refinement
-    {
-      myIsRefinementRequired1 = Standard_True;
-      aStep1 = aStep2;
-    }
-    else if (aStep2 / aStep1 > 2.) // 2nd edge needs refinement
-    {
-      myIsRefinementRequired2 = Standard_True;
-      aStep2 = aStep1;
-    }
-
-    if (myIsRefinementRequired1)
-    {
-      if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape1), aStep1, myAddVertices1, myAddStatus1))
-      {
-        return Standard_False;
-      }
-    }
-
-    if (myIsRefinementRequired2)
-    {
-      if (!getEdgeAdditionalVertices (TopoDS::Edge (myShape2), aStep2, myAddVertices2, myAddStatus2))
-      {
-        return Standard_False;
-      }
-    }
-  }
-  else if ((myShapeType1 == TopAbs_FACE) && (myShapeType2 == TopAbs_FACE))
-  {
-    if (aStep1 / aStep2 > 2) // 1st face needs refinement
-    {
-      myIsRefinementRequired1 = Standard_True;
-      aStep1 = myStep2;
-    }
-    else if (aStep2 / aStep1 > 2.) // 2nd face needs refinement
-    {
-      myIsRefinementRequired2 = Standard_True;
-      aStep2 = myStep1;
-    }
-
-    if (myIsRefinementRequired1)
-    {
-      return getFaceAdditionalVertices (TopoDS::Face (myShape1), aStep1, myAddVertices1, myAddStatus1);
-    }
-
-    if (myIsRefinementRequired2)
-    {
-      return getFaceAdditionalVertices (TopoDS::Face (myShape2), aStep2, myAddVertices2, myAddStatus2);
-    }
-  }
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : Perform
-//purpose  : Performs the computation of the proximity value
-//=======================================================================
-void BRepExtrema_ProximityValueTool::Perform (Standard_Real& theTolerance)
-{
-  if (!myIsInitS1 || !myIsInitS2 || (myShapeType1 != myShapeType2))
-    return;
-
-  //get vertices on shapes with refining a coarser mesh if it's needed
-  if (!getShapesAdditionalVertices())
-    return;
-
-  // max(min) dist from the 1st shape to the 2nd one
-  BVH_Vec3d aP1_1, aP1_2;
-  ProxPnt_Status aPointStatus1_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-  ProxPnt_Status aPointStatus1_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-
-  Standard_Real aProximityDist1 = computeProximityDist (mySet1, myNbSamples1, myAddVertices1, myAddStatus1,
-                                                        mySet2,
-                                                        myShapeList1, myShapeList2,
-                                                        aP1_1, aP1_2,
-                                                        aPointStatus1_1, aPointStatus1_2);
-
-  if (aProximityDist1 < 0.)
-    return;
-
-  // max(min) dist from the 2nd shape to t he 1st one
-  BVH_Vec3d aP2_1, aP2_2;
-  ProxPnt_Status aPointStatus2_1 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-  ProxPnt_Status aPointStatus2_2 = ProxPnt_Status::ProxPnt_Status_UNKNOWN;
-
-  Standard_Real aProximityDist2 = computeProximityDist (mySet2, myNbSamples2, myAddVertices2, myAddStatus2,
-                                                        mySet1,
-                                                        myShapeList2, myShapeList1,
-                                                        aP2_2, aP2_1,
-                                                        aPointStatus2_2, aPointStatus2_1);
-
-  if (aProximityDist2 < 0.)
-    return;
-
-  // min dist of the two max(min) dists
-  if (aProximityDist1 < aProximityDist2)
-  {
-    myDistance = aProximityDist1;
-    myPnt1.SetCoord(aP1_1.x(), aP1_1.y(), aP1_1.z());
-    myPnt2.SetCoord(aP1_2.x(), aP1_2.y(), aP1_2.z());
-    myPntStatus1 = aPointStatus1_1;
-    myPntStatus2 = aPointStatus1_2;
-  }
-  else
-  {
-    myDistance = aProximityDist2;
-    myPnt1.SetCoord(aP2_1.x(), aP2_1.y(), aP2_1.z());
-    myPnt2.SetCoord(aP2_2.x(), aP2_2.y(), aP2_2.z());
-    myPntStatus1 = aPointStatus2_1;
-    myPntStatus2 = aPointStatus2_2;
-  }
-
-  myIsDone = Standard_True;
-  theTolerance = myDistance;
-}
-
-//=======================================================================
-//function : Inspect
-//purpose  : Used for selection and storage of coinciding nodes
-//=======================================================================
-NCollection_CellFilter_Action BRepExtrema_VertexInspector::Inspect (const Standard_Integer theTarget)
-{
-  myIsNeedAdd = Standard_True;
-
-  const gp_XYZ& aPnt = myPoints.Value (theTarget - 1);
-  Standard_Real aDx, aDy, aDz;
-  aDx = myCurrent.X() - aPnt.X();
-  aDy = myCurrent.Y() - aPnt.Y();
-  aDz = myCurrent.Z() - aPnt.Z();
-
-  if ((aDx * aDx <= myTol) && (aDy * aDy <= myTol) && (aDz * aDz <= myTol))
-    myIsNeedAdd = Standard_False;
-
-  return CellFilter_Keep;
-}
--- a/src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx
+++ b/src/BRepExtrema/BRepExtrema_ProximityValueTool.hxx
@@ -1,242 +0,0 @@
-// Created on: 2022-08-08
-// Created by: Kseniya NOSULKO
-// Copyright (c) 2022 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _BRepExtrema_ProximityValueTool_HeaderFile
-#define _BRepExtrema_ProximityValueTool_HeaderFile
-
-#include <BRepExtrema_ProximityDistTool.hxx>
-#include <BRepExtrema_TriangleSet.hxx>
-#include <NCollection_CellFilter.hxx>
-#include <Precision.hxx>
-
-typedef NCollection_Vector<gp_XYZ> VectorOfPoint;
-
-//! Class BRepExtrema_VertexInspector
-//!   derived from NCollection_CellFilter_InspectorXYZ
-//!   This class define the Inspector interface for CellFilter algorithm,
-//!   working with gp_XYZ points in 3d space.
-//!   Used in search of coincidence points with a certain tolerance.
-class BRepExtrema_VertexInspector : public NCollection_CellFilter_InspectorXYZ
-{
-public:
-  typedef Standard_Integer Target;
-
-  //! Constructor; remembers the tolerance
-  BRepExtrema_VertexInspector()
-  : myTol (Precision::SquareConfusion()),
-    myIsNeedAdd (Standard_True)
-  {}
-
-  //! Keep the points used for comparison
-  void Add (const gp_XYZ& thePnt)
-  {
-    myPoints.Append (thePnt);
-  }
-
-  //! Set tolerance for comparison of point coordinates
-  void SetTol (const Standard_Real theTol)
-  {
-    myTol = theTol;
-  }
-
-  //! Set current point to search for coincidence
-  void SetCurrent (const gp_XYZ& theCurPnt)
-  {
-    myCurrent = theCurPnt;
-    myIsNeedAdd = Standard_True;
-  }
-
-  Standard_Boolean IsNeedAdd()
-  {
-    return myIsNeedAdd;
-  }
-
-  //! Implementation of inspection method
-  Standard_EXPORT NCollection_CellFilter_Action Inspect (const Standard_Integer theTarget);
-
-private:
-  Standard_Real myTol;
-  Standard_Boolean myIsNeedAdd;
-  VectorOfPoint myPoints;
-  gp_XYZ myCurrent;
-};
-
-typedef NCollection_CellFilter<BRepExtrema_VertexInspector> BRepExtrema_CellFilter;
-typedef typename BRepExtrema_ProximityDistTool::ProxPnt_Status ProxPnt_Status;
-
-//! Tool class for computation of the proximity value from one BVH
-//! primitive set to another, solving max(min) problem.
-//! Handles only edge/edge or face/face cases.
-//! This tool is not intended to be used independently, and is integrated
-//! in other classes, implementing algorithms based on shape tessellation
-//! (BRepExtrema_ShapeProximity and BRepExtrema_SelfIntersection).
-//! 
-//! Please note that algorithm results are approximate and depend greatly
-//! on the quality of input tessellation(s).
-class BRepExtrema_ProximityValueTool
-{
-
-public:
-
-  //! Creates new unitialized proximity tool.
-  Standard_EXPORT BRepExtrema_ProximityValueTool();
-
-  //! Creates new proximity tool for the given element sets.
-  Standard_EXPORT BRepExtrema_ProximityValueTool (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                                  const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                                  const BRepExtrema_ShapeList& theShapeList1,
-                                                  const BRepExtrema_ShapeList& theShapeList2);
-
-public:
-
-  //! Loads the given element sets into the proximity tool.
-  Standard_EXPORT void LoadTriangleSets (const Handle (BRepExtrema_TriangleSet)& theSet1,
-                                         const Handle (BRepExtrema_TriangleSet)& theSet2);
-
-  //! Loads the given list of subshapes into the proximity tool.
-  Standard_EXPORT void LoadShapeLists (const BRepExtrema_ShapeList& theShapeList1,
-                                       const BRepExtrema_ShapeList& theShapeList2);
-
-  //! Sets number of sample points used for proximity calculation for each shape.
-  //! If number is less or equal zero, all triangulation nodes are used.
-  Standard_EXPORT void SetNbSamplePoints (const Standard_Integer theSamples1 = 0,
-                                          const Standard_Integer theSamples2 = 0);
-
-  //! Performs the computation of the proximity value.
-  Standard_EXPORT void Perform (Standard_Real& theTolerance);
-
-  //! Is proximity test completed?
-  Standard_Boolean IsDone() const { return myIsDone; }
-
-  //! Marks test results as outdated.
-  void MarkDirty() { myIsDone = Standard_False; }
-
-  //! Returns the computed distance.
-  Standard_Real Distance() const { return myDistance; }
-
-  //! Returns points on triangles sets, which provide the proximity distance.
-  void ProximityPoints(gp_Pnt& thePoint1, gp_Pnt& thePoint2) const
-  {
-    thePoint1 = myPnt1;
-    thePoint2 = myPnt2;
-  }
-
-  //! Returns status of points on triangles sets, which provide the proximity distance.
-  void ProximityPointsStatus (ProxPnt_Status& thePointStatus1, ProxPnt_Status& thePointStatus2) const
-  {
-    thePointStatus1 = myPntStatus1;
-    thePointStatus2 = myPntStatus2;
-  }
-
-private:
-
-  //! Gets shape data for further refinement.
-  Standard_Boolean getInfoForRefinement (const TopoDS_Shape& theShapes,
-                                         TopAbs_ShapeEnum& theShapeType,
-                                         Standard_Integer& theNbNodes,
-                                         Standard_Real& theStep);
-
-  //! Returns the computed proximity value from first BVH to another one.
-  Standard_Real computeProximityDist (const Handle(BRepExtrema_TriangleSet)& theSet1,
-                                      const Standard_Integer theNbSamples1,
-                                      const BVH_Array3d& theAddVertices1,
-                                      const NCollection_Vector<ProxPnt_Status>& theAddStatus1,
-                                      const Handle(BRepExtrema_TriangleSet)& theSet2,
-                                      const BRepExtrema_ShapeList& theShapeList1,
-                                      const BRepExtrema_ShapeList& theShapeList2,
-                                      BVH_Vec3d& thePoint1,
-                                      BVH_Vec3d& thePoint2,
-                                      ProxPnt_Status& thePointStatus1,
-                                      ProxPnt_Status& thePointStatus2) const;
-
-  //! Gets additional vertices on shapes with refining a coarser one if it's needed.
-  Standard_Boolean getShapesAdditionalVertices();
-
-  //! Gets additional vertices and their statuses on the edge with the input step.
-  Standard_Boolean getEdgeAdditionalVertices (const TopoDS_Edge& theEdge,
-                                              const Standard_Real theStep,
-                                              BVH_Array3d& theAddVertices,
-                                              NCollection_Vector<ProxPnt_Status>& theAddStatuses);
-
-  //! Gets additional vertices and their statuses on the face with the input step (triangle square).
-  Standard_Boolean getFaceAdditionalVertices (const TopoDS_Face& theFace,
-                                              const Standard_Real theStep,
-                                              BVH_Array3d& theAddVertices,
-                                              NCollection_Vector<ProxPnt_Status>& theAddStatuses);
-
-  //! Splits the triangle recursively, halving the longest side
-  //! to the area of the current triangle > input step
-  void doRecurTrgSplit (const gp_Pnt (&theTrg)[3],
-                        const ProxPnt_Status (&theEdgesStatus)[3],
-                        const Standard_Real theTol,
-                        const Standard_Real theStep,
-                        BVH_Array3d& theAddVertices,
-                        NCollection_Vector<ProxPnt_Status>& theAddStatuses);
-private:
-
-  //! Set of all mesh primitives of the 1st shape.
-  Handle(BRepExtrema_TriangleSet) mySet1;
-  //! Set of all mesh primitives of the 2nd shape.
-  Handle(BRepExtrema_TriangleSet) mySet2;
-
-  //! List of subshapes of the 1st shape.
-  BRepExtrema_ShapeList myShapeList1;
-  //! List of subshapes of the 2nd shape.
-  BRepExtrema_ShapeList myShapeList2;
-
-  //! The 1st shape.
-  TopoDS_Shape myShape1;
-  //! The 2nd shape.
-  TopoDS_Shape myShape2;
-
-  BVH_Array3d myAddVertices1; //!< Additional vertices on the 1st shape if its mesh is coarser.
-  BVH_Array3d myAddVertices2; //!< Additional vertices on the 2nd shape if its mesh is coarser.
-
-  NCollection_Vector<ProxPnt_Status> myAddStatus1; //!< Status of additional vertices on the 1st shape.
-  NCollection_Vector<ProxPnt_Status> myAddStatus2; //!< Status of additional vertices on the 2nd shape.
-
-  Standard_Boolean myIsInitS1; //!< Is the 1st shape initialized?
-  Standard_Boolean myIsInitS2; //!< Is the 2nd shape initialized?
-
-  Standard_Boolean myIsRefinementRequired1; //!< Flag about the need to refine the 1st shape.
-  Standard_Boolean myIsRefinementRequired2; //!< Flag about the need to refine the 2nd shape.
-
-  Standard_Integer myNbNodes1; //!< Number of nodes in triangulation of the 1st shape.
-  Standard_Integer myNbNodes2; //!< Number of nodes in triangulation of the 2nd shape.
-
-  Standard_Real myStep1; //!< Step for getting vertices on the 1st shape.
-  Standard_Real myStep2; //!< Step for getting vertices on the 2nd shape.
-
-  BRepExtrema_CellFilter myCells;
-  BRepExtrema_VertexInspector myInspector;
-
-  TopAbs_ShapeEnum myShapeType1; //!< 1st shape type.
-  TopAbs_ShapeEnum myShapeType2; //!< 2nd shape type.
-
-  Standard_Real myDistance;  //!< Distance
-  Standard_Boolean myIsDone; //!< State of the algorithm
-
-  Standard_Integer myNbSamples1; //!< Number of samples points on the first shape
-  Standard_Integer myNbSamples2; //!< Number of samples points on the second shape
-
-  //! Proximity points
-  gp_Pnt myPnt1, myPnt2;
-
-  //! Proximity points' status
-  ProxPnt_Status myPntStatus1, myPntStatus2;
-
-};
-
-#endif // _BRepExtrema_ProximityValueTool_HeaderFile
--- a/src/BRepExtrema/BRepExtrema_SelfIntersection.hxx
+++ b/src/BRepExtrema/BRepExtrema_SelfIntersection.hxx
@@ -18,8 +18,6 @@

 #include <BRepExtrema_OverlapTool.hxx>

-#include <TopoDS.hxx>
-
 //! Tool class for detection of self-sections in the given shape.
 //! This class is based on BRepExtrema_OverlapTool and thus uses
 //! shape tessellation to detect incorrect mesh fragments (pairs
@@ -78,7 +76,7 @@ public:
  //! Returns sub-shape from the shape for the given index (started from 0).
  const TopoDS_Face& GetSubShape (const Standard_Integer theID) const
  {
-    return TopoDS::Face(myFaceList.Value(theID));
+    return myFaceList.Value (theID);
  }

  //! Returns set of all the face triangles of the shape.
--- a/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
+++ b/src/BRepExtrema/BRepExtrema_ShapeProximity.cxx
@@ -18,28 +18,6 @@
 #include <Precision.hxx>
 #include <TopExp_Explorer.hxx>

-// Assign a map of sub-shapes (edges/faces) of a given shape
-static Standard_Boolean initSubShapes(const TopoDS_Shape&              theShape,
-                                      BRepExtrema_ShapeList&           theSubshapesList,
-                                      Handle(BRepExtrema_TriangleSet)& theTriangleSet)
-{
-  theSubshapesList.Clear();
-
-  for (TopExp_Explorer anIter(theShape, TopAbs_FACE); anIter.More(); anIter.Next())
-  {
-    theSubshapesList.Append(anIter.Current());
-  }
-
-  for (TopExp_Explorer anIter(theShape, TopAbs_EDGE); anIter.More(); anIter.Next())
-  {
-    theSubshapesList.Append(anIter.Current());
-  }
-
-  if (theTriangleSet.IsNull())
-    theTriangleSet = new BRepExtrema_TriangleSet;
-  return theTriangleSet->Init(theSubshapesList);
-}
-
 //=======================================================================
 //function : BRepExtrema_ShapeProximity
 //purpose  : Creates uninitialized proximity tool
@@ -47,9 +25,7 @@ static Standard_Boolean initSubShapes(const TopoDS_Shape&              theShape,
 BRepExtrema_ShapeProximity::BRepExtrema_ShapeProximity (const Standard_Real theTolerance)
 : myTolerance   (theTolerance),
  myElementSet1 (new BRepExtrema_TriangleSet),
-  myElementSet2 (new BRepExtrema_TriangleSet),
-  myNbSamples1  (0),
-  myNbSamples2  (0)
+  myElementSet2 (new BRepExtrema_TriangleSet)
 {
  // Should be initialized later
  myIsInitS1 = myIsInitS2 = Standard_False;
@@ -64,9 +40,7 @@ BRepExtrema_ShapeProximity::BRepExtrema_ShapeProximity (const TopoDS_Shape& theS
                                                        const Standard_Real theTolerance)
 : myTolerance   (theTolerance),
  myElementSet1 (new BRepExtrema_TriangleSet),
-  myElementSet2 (new BRepExtrema_TriangleSet),
-  myNbSamples1  (0),
-  myNbSamples2  (0)
+  myElementSet2 (new BRepExtrema_TriangleSet)
 {
  LoadShape1 (theShape1);
  LoadShape2 (theShape2);
@@ -78,18 +52,16 @@ BRepExtrema_ShapeProximity::BRepExtrema_ShapeProximity (const TopoDS_Shape& theS
 //=======================================================================
 Standard_Boolean BRepExtrema_ShapeProximity::LoadShape1 (const TopoDS_Shape& theShape1)
 {
-  myIsInitS1 = initSubShapes(theShape1, myShapeList1, myElementSet1);
+  myFaceList1.Clear();

-  if (myTolerance == Precision::Infinite())
+  for (TopExp_Explorer anIter (theShape1, TopAbs_FACE); anIter.More(); anIter.Next())
  {
-    myProxValTool.MarkDirty();
-  }
-  else
-  {
-    myOverlapTool.MarkDirty();
+    myFaceList1.Append (static_cast<const TopoDS_Face&> (anIter.Current()));
  }

-  return myIsInitS1;
+  myOverlapTool.MarkDirty();
+
+  return myIsInitS1 = myElementSet1->Init (myFaceList1);
 }

 //=======================================================================
@@ -98,18 +70,16 @@ Standard_Boolean BRepExtrema_ShapeProximity::LoadShape1 (const TopoDS_Shape& the
 //=======================================================================
 Standard_Boolean BRepExtrema_ShapeProximity::LoadShape2 (const TopoDS_Shape& theShape2)
 {
-  myIsInitS2 = initSubShapes(theShape2, myShapeList2, myElementSet2);
+  myFaceList2.Clear();

-  if (myTolerance == Precision::Infinite())
+  for (TopExp_Explorer anIter (theShape2, TopAbs_FACE); anIter.More(); anIter.Next())
  {
-    myProxValTool.MarkDirty();
-  }
-  else
-  {
-    myOverlapTool.MarkDirty();
+    myFaceList2.Append (static_cast<const TopoDS_Face&> (anIter.Current()));
  }

-  return myIsInitS2;
+  myOverlapTool.MarkDirty();
+
+  return myIsInitS2 = myElementSet2->Init (myFaceList2);
 }

 //=======================================================================
@@ -118,33 +88,13 @@ Standard_Boolean BRepExtrema_ShapeProximity::LoadShape2 (const TopoDS_Shape& the
 //=======================================================================
 void BRepExtrema_ShapeProximity::Perform()
 {
-  if (myTolerance == Precision::Infinite())
+  if (!myIsInitS1 || !myIsInitS2 || myOverlapTool.IsDone())
  {
-    if (!myIsInitS1 || !myIsInitS2 || myProxValTool.IsDone())
-    {
-      return;
-    }
-
-    myProxValTool.LoadTriangleSets (myElementSet1,
-                                    myElementSet2);
-    myProxValTool.LoadShapeLists (myShapeList1,
-                                  myShapeList2);
-    myProxValTool.SetNbSamplePoints (myNbSamples1, myNbSamples2);
-
-    myProxValTool.Perform (myTolerance);
-    myProxValTool.ProximityPoints(myProxPoint1, myProxPoint2);
-    myProxValTool.ProximityPointsStatus (myProxPntStatus1, myProxPntStatus2);
+    return;
  }
-  else
-  {
-    if (!myIsInitS1 || !myIsInitS2 || myOverlapTool.IsDone())
-    {
-      return;
-    }

-    myOverlapTool.LoadTriangleSets (myElementSet1,
-                                    myElementSet2);
+  myOverlapTool.LoadTriangleSets (myElementSet1,
+                                  myElementSet2);

-    myOverlapTool.Perform (myTolerance);
-  }
+  myOverlapTool.Perform (myTolerance);
 }
--- a/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
+++ b/src/BRepExtrema/BRepExtrema_ShapeProximity.hxx
@@ -16,47 +16,31 @@
 #ifndef _BRepExtrema_ShapeProximity_HeaderFile
 #define _BRepExtrema_ShapeProximity_HeaderFile

-#include <NCollection_DataMap.hxx>
-#include <Precision.hxx>
-#include <TColStd_PackedMapOfInteger.hxx>
-
-#include <BRepExtrema_ProximityValueTool.hxx>
-#include <BRepExtrema_TriangleSet.hxx>
 #include <BRepExtrema_OverlapTool.hxx>

-//! @brief Tool class for shape proximity detection.
-//!
-//! First approach:
+//! Tool class for shape proximity detection.
 //! For two given shapes and given tolerance (offset from the mesh) the algorithm allows
 //! to determine whether or not they are overlapped. The algorithm input consists of any
 //! shapes which can be decomposed into individual faces (used as basic shape elements).
+//! High performance is achieved through the use of existing triangulation of faces. So
+//! poly triangulation (with the desired deflection) should already be built. Note that
+//! solution is approximate (and corresponds to the deflection used for triangulation).
 //!
 //! The algorithm can be run in two modes. If tolerance is set to zero, the algorithm
 //! will detect only intersecting faces (containing triangles with common points). If
 //! tolerance is set to positive value, the algorithm will also detect faces located
 //! on distance less than the given tolerance from each other.
-//!
-//! Second approach:
-//! Compute the proximity value between two shapes (handles only edge/edge or face/face cases)
-//! if the tolerance is not defined (Precision::Infinite()).
-//! In this case the proximity value is a minimal thickness of a layer containing both shapes.
-//!
-//! For the both approaches the high performance is achieved through the use of existing
-//! triangulation of faces. So, poly triangulation (with the desired deflection) should already
-//! be built. Note that solution is approximate (and corresponds to the deflection used for
-//! triangulation).
 class BRepExtrema_ShapeProximity
 {
-
 public:

  //! Creates empty proximity tool.
-  Standard_EXPORT BRepExtrema_ShapeProximity (const Standard_Real theTolerance = Precision::Infinite());
+  Standard_EXPORT BRepExtrema_ShapeProximity (const Standard_Real theTolerance = 0.0);

  //! Creates proximity tool for the given two shapes.
  Standard_EXPORT BRepExtrema_ShapeProximity (const TopoDS_Shape& theShape1,
                                              const TopoDS_Shape& theShape2,
-                                              const Standard_Real theTolerance = Precision::Infinite());
+                                              const Standard_Real theTolerance = 0.0);

 public:

@@ -72,33 +56,19 @@ public:
    myTolerance = theTolerance;
  }

-  //! Returns proximity value calculated for the whole input shapes.
-  Standard_Real Proximity() const
-  {
-    return Tolerance();
-  }
-
  //! Loads 1st shape into proximity tool.
  Standard_EXPORT Standard_Boolean LoadShape1 (const TopoDS_Shape& theShape1);

  //! Loads 2nd shape into proximity tool.
  Standard_EXPORT Standard_Boolean LoadShape2 (const TopoDS_Shape& theShape2);

-  //! Set number of sample points on the 1st shape used to compute the proximity value.
-  //! In case of 0, all triangulation nodes will be used.
-  void SetNbSamples1(const Standard_Integer theNbSamples) { myNbSamples1 = theNbSamples; }
-
-  //! Set number of sample points on the 2nd shape used to compute the proximity value.
-  //! In case of 0, all triangulation nodes will be used.
-  void SetNbSamples2(const Standard_Integer theNbSamples) { myNbSamples2 = theNbSamples; }
-
  //! Performs search of overlapped faces.
  Standard_EXPORT void Perform();

  //! True if the search is completed.
  Standard_Boolean IsDone() const
  { 
-    return myOverlapTool.IsDone() || myProxValTool.IsDone();
+    return myOverlapTool.IsDone();
  }

  //! Returns set of IDs of overlapped faces of 1st shape (started from 0).
@@ -114,15 +84,15 @@ public:
  }

  //! Returns sub-shape from 1st shape with the given index (started from 0).
-  const TopoDS_Shape& GetSubShape1 (const Standard_Integer theID) const
+  const TopoDS_Face& GetSubShape1 (const Standard_Integer theID) const
  {
-    return myShapeList1.Value (theID);
+    return myFaceList1.Value (theID);
  }

  //! Returns sub-shape from 1st shape with the given index (started from 0).
-  const TopoDS_Shape& GetSubShape2 (const Standard_Integer theID) const
+  const TopoDS_Face& GetSubShape2 (const Standard_Integer theID) const
  {
-    return myShapeList2.Value (theID);
+    return myFaceList2.Value (theID);
  }

  //! Returns set of all the face triangles of the 1st shape.
@@ -137,34 +107,6 @@ public:
    return myElementSet2;
  }

-  //! Returns the point on the 1st shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const gp_Pnt& ProximityPoint1() const
-  {
-    return myProxPoint1;
-  }
-
-  //! Returns the point on the 2nd shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const gp_Pnt& ProximityPoint2() const
-  {
-    return myProxPoint2;
-  }
-
-  //! Returns the status of point on the 1st shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const ProxPnt_Status& ProxPntStatus1() const
-  {
-    return myProxPntStatus1;
-  }
-
-  //! Returns the status of point on the 2nd shape, which could be used as a reference point
-  //! for the value of the proximity.
-  const ProxPnt_Status& ProxPntStatus2() const
-  {
-    return myProxPntStatus2;
-  }
-
 private:

  //! Maximum overlapping distance.
@@ -175,39 +117,19 @@ private:
  //! Is the 2nd shape initialized?
  Standard_Boolean myIsInitS2;

-  //! List of subshapes of the 1st shape.
-  BRepExtrema_ShapeList myShapeList1;
-  //! List of subshapes of the 2nd shape.
-  BRepExtrema_ShapeList myShapeList2;
+  //! List of faces of the 1st shape.
+  BRepExtrema_ShapeList myFaceList1;
+  //! List of faces of the 2nd shape.
+  BRepExtrema_ShapeList myFaceList2;

  //! Set of all the face triangles of the 1st shape.
  Handle(BRepExtrema_TriangleSet) myElementSet1;
  //! Set of all the face triangles of the 2nd shape.
  Handle(BRepExtrema_TriangleSet) myElementSet2;

-  //! Number of sample points on the 1st shape used to compute the proximity value
-  //! (if zero (default), all triangulation nodes will be used).
-  Standard_Integer myNbSamples1;
-  //! Number of sample points on the 2nd shape used to compute the proximity value
-  //! (if zero (default), all triangulation nodes will be used).
-  Standard_Integer myNbSamples2;
-
-  //! Reference point of the proximity value on the 1st shape.
-  gp_Pnt myProxPoint1;
-  //! Reference point of the proximity value on the 2st shape.
-  gp_Pnt myProxPoint2;
-
-  //! Status of reference points of the proximity value.
-  ProxPnt_Status myProxPntStatus1, myProxPntStatus2;
-
  //! Overlap tool used for intersection/overlap test.
  BRepExtrema_OverlapTool myOverlapTool;

-  //! Shape-shape proximity tool used for computation of
-  //! the minimal diameter of a tube containing both edges or
-  //! the minimal thickness of a shell containing both faces.
-  BRepExtrema_ProximityValueTool myProxValTool;
-
 };

 #endif // _BRepExtrema_ShapeProximity_HeaderFile
--- a/src/BRepExtrema/BRepExtrema_TriangleSet.cxx
+++ b/src/BRepExtrema/BRepExtrema_TriangleSet.cxx
@@ -18,7 +18,6 @@
 #include <BRep_Tool.hxx>
 #include <BVH_LinearBuilder.hxx>
 #include <Poly_Triangulation.hxx>
-#include <TopoDS.hxx>

 IMPLEMENT_STANDARD_RTTIEXT(BRepExtrema_TriangleSet, BVH_PrimitiveSet3d)

@@ -115,65 +114,17 @@ void BRepExtrema_TriangleSet::Swap (const Standard_Integer theIndex1, const Stan
 {
  std::swap (myTriangles[theIndex1],
             myTriangles[theIndex2]);
-
-  std::swap (myTrgIdxMap (theIndex1),
-             myTrgIdxMap (theIndex2));
 }

 //=======================================================================
 //function : GetFaceID
-//purpose  : Returns face ID of the given vertex
+//purpose  : Returns face ID of the given triangle
 //=======================================================================
 Standard_Integer BRepExtrema_TriangleSet::GetFaceID (const Standard_Integer theIndex) const
 {
  return myTriangles[theIndex].w();
 }

-//=======================================================================
-//function : GetShapeIDOfVtx
-//purpose  : Returns shape ID of the given vertex index
-//=======================================================================
-Standard_Integer BRepExtrema_TriangleSet::GetShapeIDOfVtx (const Standard_Integer theIndex) const
-{
-  return myShapeIdxOfVtxVec.Value (theIndex);
-}
-
-//=======================================================================
-//function : GetVtxIdxInShape
-//purpose  : Returns vertex index in tringulation of the shape, which vertex belongs,
-//           with the given vtx ID in whole set
-//=======================================================================
-Standard_Integer BRepExtrema_TriangleSet::GetVtxIdxInShape (const Standard_Integer theIndex) const
-{
-  Standard_Integer aShID = myShapeIdxOfVtxVec.Value (theIndex);
-  Standard_Integer aNumVertices = 0;
-
-  for (Standard_Integer aSIdx = 0; aSIdx < aShID; aSIdx++)
-  {
-    aNumVertices += myNumVtxInShapeVec.Value (aSIdx);
-  }
-
-  return theIndex - aNumVertices;
-}
-
-//=======================================================================
-//function : GetTrgIdxInShape
-//purpose  :  Returns triangle index (before swapping) in tringulation of the shape, which triangle belongs,
-//            with the given trg ID in whole set (after swapping)
-//=======================================================================
-Standard_Integer BRepExtrema_TriangleSet::GetTrgIdxInShape (const Standard_Integer theIndex) const
-{
-  Standard_Integer aShID = GetFaceID (theIndex);
-  Standard_Integer aNumTriangles = 0;
-
-  for (Standard_Integer aSIdx = 0; aSIdx < aShID; aSIdx++)
-  {
-    aNumTriangles += myNumTrgInShapeVec.Value (aSIdx);
-  }
-
-  return myTrgIdxMap (theIndex) - aNumTriangles;
-}
-
 //=======================================================================
 //function : GetVertices
 //purpose  : Returns vertices of the given triangle
@@ -190,21 +141,6 @@ void BRepExtrema_TriangleSet::GetVertices (const Standard_Integer theIndex,
  theVertex3 = myVertexArray[aTriangle.z()];
 }

-//=======================================================================
-//function : GetVertices
-//purpose  : Returns vertices of the given triangle
-//=======================================================================
-void BRepExtrema_TriangleSet::GetVtxIndices (const Standard_Integer theIndex,
-                                             NCollection_Array1<Standard_Integer>& theVtxIndices) const
-{
-  BVH_Vec4i aTriangle = myTriangles[theIndex];
-
-  theVtxIndices = NCollection_Array1<Standard_Integer> (0, 2);
-  theVtxIndices.SetValue (0, aTriangle.x());
-  theVtxIndices.SetValue (1, aTriangle.y());
-  theVtxIndices.SetValue (2, aTriangle.z());
-}
-
 //=======================================================================
 //function : Clear
 //purpose  : Clears triangle set data
@@ -222,26 +158,41 @@ void BRepExtrema_TriangleSet::Clear()
 //function : Init
 //purpose  : Initializes triangle set
 //=======================================================================
-Standard_Boolean BRepExtrema_TriangleSet::Init (const BRepExtrema_ShapeList& theShapes)
+Standard_Boolean BRepExtrema_TriangleSet::Init (const BRepExtrema_ShapeList& theFaces)
 {
  Clear();

-  Standard_Boolean isOK = Standard_True;
-  for (Standard_Integer aShapeIdx = 0; aShapeIdx < theShapes.Size() && isOK; ++aShapeIdx)
+  for (Standard_Integer aFaceIdx = 0; aFaceIdx < theFaces.Size(); ++aFaceIdx)
  {
-    if (theShapes (aShapeIdx).ShapeType() == TopAbs_FACE)
-      isOK = initFace (TopoDS::Face (theShapes(aShapeIdx)), aShapeIdx);
-    else if (theShapes (aShapeIdx).ShapeType() == TopAbs_EDGE)
-      isOK = initEdge (TopoDS::Edge (theShapes(aShapeIdx)), aShapeIdx);
-  }
+    TopLoc_Location aLocation;

-  Standard_Integer aNumTrg = static_cast<Standard_Integer> (myTriangles.size());
-  myTrgIdxMap.Clear();
-  myTrgIdxMap.ReSize (aNumTrg);
+    Handle(Poly_Triangulation) aTriangulation =
+      BRep_Tool::Triangulation (theFaces (aFaceIdx), aLocation);

-  for (Standard_Integer aTrgIdx = 0; aTrgIdx < aNumTrg; ++aTrgIdx)
-  {
-    myTrgIdxMap.Bind (aTrgIdx, aTrgIdx);
+    if (aTriangulation.IsNull())
+    {
+      return Standard_False;
+    }
+
+    const Standard_Integer aVertOffset =
+      static_cast<Standard_Integer> (myVertexArray.size()) - 1;
+
+    for (Standard_Integer aVertIdx = 1; aVertIdx <= aTriangulation->NbNodes(); ++aVertIdx)
+    {
+      gp_Pnt aVertex = aTriangulation->Node (aVertIdx);
+      aVertex.Transform (aLocation.Transformation());
+      myVertexArray.push_back (BVH_Vec3d (aVertex.X(), aVertex.Y(), aVertex.Z()));
+    }
+
+    for (Standard_Integer aTriIdx = 1; aTriIdx <= aTriangulation->NbTriangles(); ++aTriIdx)
+    {
+      Standard_Integer aVertex1, aVertex2, aVertex3;
+      aTriangulation->Triangle (aTriIdx).Get (aVertex1, aVertex2, aVertex3);
+      myTriangles.push_back (BVH_Vec4i (aVertex1 + aVertOffset,
+                                        aVertex2 + aVertOffset,
+                                        aVertex3 + aVertOffset,
+                                        aFaceIdx));
+    }
  }

  MarkDirty(); // needs BVH rebuilding
@@ -252,95 +203,3 @@ Standard_Boolean BRepExtrema_TriangleSet::Init (const BRepExtrema_ShapeList& the
  return Standard_True;
 }

-//=======================================================================
-//function : initFace
-//purpose  : Initializes triangle set
-//=======================================================================
-Standard_Boolean BRepExtrema_TriangleSet::initFace (const TopoDS_Face& theFace, const Standard_Integer theIndex)
-{
-  TopLoc_Location aLocation;
-
-  Handle(Poly_Triangulation) aTriangulation = BRep_Tool::Triangulation (theFace, aLocation);
-  if (aTriangulation.IsNull())
-  {
-    return Standard_False;
-  }
-
-  const Standard_Integer aVertOffset =
-    static_cast<Standard_Integer> (myVertexArray.size()) - 1;
-
-  initNodes (aTriangulation->MapNodeArray()->ChangeArray1(), aLocation.Transformation(), theIndex);
-
-  for (Standard_Integer aTriIdx = 1; aTriIdx <= aTriangulation->NbTriangles(); ++aTriIdx)
-  {
-    Standard_Integer aVertex1;
-    Standard_Integer aVertex2;
-    Standard_Integer aVertex3;
-
-    aTriangulation->Triangle (aTriIdx).Get (aVertex1,
-                                            aVertex2,
-                                            aVertex3);
-
-    myTriangles.push_back (BVH_Vec4i (aVertex1 + aVertOffset,
-                                      aVertex2 + aVertOffset,
-                                      aVertex3 + aVertOffset,
-                                      theIndex));
-  }
-
-  myNumTrgInShapeVec.SetValue (theIndex, aTriangulation->NbTriangles());
-
-  return Standard_True;
-}
-
-//=======================================================================
-//function : initEdge
-//purpose  : Initializes triangle set
-//=======================================================================
-Standard_Boolean BRepExtrema_TriangleSet::initEdge (const TopoDS_Edge& theEdge, const Standard_Integer theIndex)
-{
-  TopLoc_Location aLocation;
-
-  Handle(Poly_Polygon3D) aPolygon = BRep_Tool::Polygon3D (theEdge, aLocation);
-  if (aPolygon.IsNull())
-  {
-    return Standard_False;
-  }
-
-  const Standard_Integer aVertOffset =
-    static_cast<Standard_Integer> (myVertexArray.size()) - 1;
-
-  initNodes (aPolygon->Nodes(), aLocation.Transformation(), theIndex);
-
-  for (Standard_Integer aVertIdx = 1; aVertIdx < aPolygon->NbNodes(); ++aVertIdx)
-  {
-    // segment as degenerate triangle
-    myTriangles.push_back (BVH_Vec4i (aVertIdx + aVertOffset,
-                                      aVertIdx + aVertOffset + 1,
-                                      aVertIdx + aVertOffset + 1,
-                                      theIndex));
-  }
-  return Standard_True;
-}
-
-//=======================================================================
-//function : initNodes
-//purpose  : Initializes nodes
-//=======================================================================
-void BRepExtrema_TriangleSet::initNodes (const TColgp_Array1OfPnt& theNodes,
-                                         const gp_Trsf& theTrsf,
-                                         const Standard_Integer theIndex)
-{
-  for (Standard_Integer aVertIdx = 1; aVertIdx <= theNodes.Size(); ++aVertIdx)
-  {
-    gp_Pnt aVertex = theNodes.Value (aVertIdx);
-
-    aVertex.Transform (theTrsf);
-
-    myVertexArray.push_back (BVH_Vec3d (aVertex.X(),
-                                        aVertex.Y(),
-                                        aVertex.Z()));
-    myShapeIdxOfVtxVec.Append (theIndex);
-  }
-
-  myNumVtxInShapeVec.SetValue (theIndex, theNodes.Size());
-}
--- a/src/BRepExtrema/BRepExtrema_TriangleSet.hxx
+++ b/src/BRepExtrema/BRepExtrema_TriangleSet.hxx
@@ -16,14 +16,11 @@
 #ifndef _BRepExtrema_TriangleSet_HeaderFile
 #define _BRepExtrema_TriangleSet_HeaderFile

-#include <BVH_PrimitiveSet3d.hxx>
-#include <TColgp_Array1OfPnt.hxx>
-#include <TColStd_DataMapOfIntegerInteger.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
+#include <BVH_PrimitiveSet3d.hxx>

 //! List of shapes and their IDs for collision detection.
-typedef NCollection_Vector<TopoDS_Shape> BRepExtrema_ShapeList;
+typedef NCollection_Vector<TopoDS_Face> BRepExtrema_ShapeList;

 //! Triangle set corresponding to specific face.
 class BRepExtrema_TriangleSet : public BVH_PrimitiveSet3d
@@ -62,10 +59,7 @@ public:
  Standard_EXPORT void Clear();

  //! Initializes triangle set.
-  Standard_EXPORT Standard_Boolean Init (const BRepExtrema_ShapeList& theShapes);
-
-  //! Returns all vertices.
-  Standard_EXPORT const BVH_Array3d& GetVertices() const { return myVertexArray; }
+  Standard_EXPORT Standard_Boolean Init (const BRepExtrema_ShapeList& theFaces);

  //! Returns vertices of the given triangle.
  Standard_EXPORT void GetVertices (const Standard_Integer theIndex,
@@ -73,37 +67,9 @@ public:
                                    BVH_Vec3d&             theVertex2,
                                    BVH_Vec3d&             theVertex3) const;

-  //! Returns vertex indices of the given triangle.
-  Standard_EXPORT void GetVtxIndices (const Standard_Integer theIndex,
-                                      NCollection_Array1<Standard_Integer>& theVtxIndices) const;
-
  //! Returns face ID of the given triangle.
  Standard_EXPORT Standard_Integer GetFaceID (const Standard_Integer theIndex) const;

-  //! Returns shape ID of the given vertex index.
-  Standard_EXPORT Standard_Integer GetShapeIDOfVtx (const Standard_Integer theIndex) const;
-
-  //! Returns vertex index in tringulation of the shape, which vertex belongs,
-  //! with the given vtx ID in whole set.
-  Standard_EXPORT Standard_Integer GetVtxIdxInShape (const Standard_Integer theIndex) const;
-
-  //! Returns triangle index (before swapping) in tringulation of the shape, which triangle belongs,
-  //! with the given trg ID in whole set (after swapping).
-  Standard_EXPORT Standard_Integer GetTrgIdxInShape (const Standard_Integer theIndex) const;
-
-private:
-
-  //! Initializes triangle set from the face
-  Standard_Boolean initFace (const TopoDS_Face& theFace, const Standard_Integer theIndex);
-
-  //! Initializes polygon from the edge
-  Standard_Boolean initEdge (const TopoDS_Edge& theEdge, const Standard_Integer theIndex);
-
-  //! Initializes nodes
-  void initNodes (const TColgp_Array1OfPnt& theNodes,
-                  const gp_Trsf& theTrsf,
-                  const Standard_Integer theIndex);
-
 protected:

  //! Array of vertex indices.
@@ -112,19 +78,6 @@ protected:
  //! Array of vertex coordinates.
  BVH_Array3d myVertexArray;

-  //! Vector of shapes' indices where index of item corresponds to index of vertex,
-  //! belonging to this shape.
-  NCollection_Vector<Standard_Integer> myShapeIdxOfVtxVec;
-
-  //! Vector of vertexes' number belonging to shape which index corresponds item's index.
-  NCollection_Vector<Standard_Integer> myNumVtxInShapeVec;
-
-  //! Vector of triangles' number belonging to shape which index corresponds item's index.
-  NCollection_Vector<Standard_Integer> myNumTrgInShapeVec;
-
-  //! Map of triangles' indices after (key) and before (value) swapping.
-  TColStd_DataMapOfIntegerInteger myTrgIdxMap;
-
 public:

  DEFINE_STANDARD_RTTIEXT(BRepExtrema_TriangleSet, BVH_PrimitiveSet3d)
--- a/src/BRepExtrema/FILES
+++ b/src/BRepExtrema/FILES
@@ -18,10 +18,6 @@ BRepExtrema_OverlapTool.cxx
 BRepExtrema_OverlapTool.hxx
 BRepExtrema_Poly.cxx
 BRepExtrema_Poly.hxx
-BRepExtrema_ProximityValueTool.cxx
-BRepExtrema_ProximityValueTool.hxx
-BRepExtrema_ProximityDistTool.cxx
-BRepExtrema_ProximityDistTool.hxx
 BRepExtrema_SelfIntersection.cxx
 BRepExtrema_SelfIntersection.hxx
 BRepExtrema_SeqOfSolution.hxx
--- a/src/BRepFeat/BRepFeat.cxx
+++ b/src/BRepFeat/BRepFeat.cxx
@@ -312,7 +312,7 @@ void BRepFeat::ParametricMinMax(const TopoDS_Shape& S,
 //=======================================================================

 static Standard_Boolean IsIn (BRepTopAdaptor_FClass2d& FC,
-                              const Geom2dAdaptor_Curve& AC)
+                              Geom2dAdaptor_Curve      AC)
 {
 Standard_Real Def = 100*Precision::Confusion();
 GCPnts_QuasiUniformDeflection QU(AC,Def);
--- a/src/BRepFeat/BRepFeat_Form.cxx
+++ b/src/BRepFeat/BRepFeat_Form.cxx
@@ -489,7 +489,7 @@ static void Descendants(const TopoDS_Shape&,
 #endif
    theGlue.Perform();
    if (theGlue.IsDone()) {
-      const TopoDS_Shape& shshs = theGlue.ResultingShape();
+      TopoDS_Shape shshs = theGlue.ResultingShape();
 //      if (BRepOffsetAPI::IsTopologicallyValid(shshs)) {
      if (BRepAlgo::IsValid(shshs)) {
        UpdateDescendants(theGlue);
--- a/src/BRepFeat/BRepFeat_MakeDPrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakeDPrism.cxx
@@ -66,7 +66,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
  const TopoDS_Shape& theSFrom,
  const TopoDS_Shape& theSUntil);

-static Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+static Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
  const TopoDS_Shape& Until);

 static Handle(Geom_Curve) TestCurve(const TopoDS_Face&);
@@ -212,13 +212,13 @@ void BRepFeat_MakeDPrism::Perform(const Standard_Real Height)
  //  myPbase.Orientation(TopAbs_FORWARD);

  LocOpe_DPrism theDPrism(myPbase,theheight,myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();

  MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);

  myGShape = VraiDPrism;
  GeneratedShapeValid();  
-  const TopoDS_Shape& Base = theDPrism.FirstShape();
+  TopoDS_Shape Base = theDPrism.FirstShape();
  TopExp_Explorer exp(Base, TopAbs_FACE);
  TopoDS_Face theBase = TopoDS::Face(exp.Current());
  exp.Next();
@@ -295,12 +295,12 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
  Standard_Real Height = 
    sens*HeightMax(mySbase, mySkface, mySFrom, mySUntil);
  LocOpe_DPrism theDPrism(myPbase,Height,myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
  if(!Trf) {
    MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);
    myGShape = VraiDPrism;
    GeneratedShapeValid();
-    const TopoDS_Shape& Base = theDPrism.FirstShape();
+    TopoDS_Shape Base = theDPrism.FirstShape();
    exp.Init(Base, TopAbs_FACE);
    TopoDS_Face theBase = TopoDS::Face(exp.Current());
    exp.Next();
@@ -350,7 +350,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& Until)
      UpdateDescendants(trP, trP.Shape(), Standard_False);

      TopExp_Explorer ex(trP.Shape(), TopAbs_SOLID);
-      const TopoDS_Shape& Cutsh = ex.Current();
+      TopoDS_Shape Cutsh = ex.Current();
      if(myFuse == 1) {
        BRepAlgoAPI_Fuse f(mySbase, Cutsh);
        myShape = f.Shape();
@@ -446,7 +446,7 @@ void BRepFeat_MakeDPrism::Perform(const TopoDS_Shape& From,
  Standard_Real Height = 
    sens*HeightMax(mySbase, myPbase, mySFrom, mySUntil);
  LocOpe_DPrism theDPrism(myPbase, Height, Height, myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();


  if(!Trff) {
@@ -575,7 +575,7 @@ void BRepFeat_MakeDPrism::PerformUntilEnd()
  //  myPbase.Orientation(TopAbs_FORWARD);

  LocOpe_DPrism theDPrism(myPbase, Height, myAngle);  
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();

  MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);

@@ -624,7 +624,7 @@ void BRepFeat_MakeDPrism::PerformFromEnd(const TopoDS_Shape& Until)
    sens*HeightMax(mySbase, mySkface, mySFrom, mySUntil);

  LocOpe_DPrism theDPrism(myPbase, Height, Height, myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
  if(VraiDPrism.IsNull()) {
    NotDone();
    myStatusError = BRepFeat_NullRealTool;
@@ -762,7 +762,7 @@ void BRepFeat_MakeDPrism::PerformThruAll()

  Standard_Real Height = HeightMax(mySbase, mySkface, mySFrom, mySUntil);
  LocOpe_DPrism theDPrism(myPbase, Height, Height, myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();
  MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);

  myGShape = VraiDPrism;
@@ -819,13 +819,13 @@ void BRepFeat_MakeDPrism::PerformUntilHeight(const TopoDS_Shape& Until,
  Standard_Integer sens = SensOfPrism(C, mySUntil);

  LocOpe_DPrism theDPrism(myPbase,sens*Height,myAngle);
-  const TopoDS_Shape& VraiDPrism = theDPrism.Shape();
+  TopoDS_Shape VraiDPrism = theDPrism.Shape();

  if(!Trf) {    // case face finished
    MajMap(myPbase,theDPrism,myMap,myFShape,myLShape);
    myGShape = VraiDPrism;
    GeneratedShapeValid();
-    const TopoDS_Shape& Base = theDPrism.FirstShape();
+    TopoDS_Shape Base = theDPrism.FirstShape();
    exp.Init(Base, TopAbs_FACE);
    TopoDS_Face theBase = TopoDS::Face(exp.Current());
    exp.Next();
@@ -1074,7 +1074,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,  // shape initial
 //function : SensOfPrism
 //purpose  : determine the direction of prism generation
 //=======================================================================
-Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
  const TopoDS_Shape& Until)
 {
  LocOpe_CSIntersector ASI1(Until);
--- a/src/BRepFeat/BRepFeat_MakePrism.cxx
+++ b/src/BRepFeat/BRepFeat_MakePrism.cxx
@@ -68,7 +68,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
 			       const TopoDS_Shape& theSFrom,
 			       const TopoDS_Shape& theSUntil);

-static Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+static Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
 				    const TopoDS_Shape& Until);

 static Handle(Geom_Curve) TestCurve(const TopoDS_Shape&,
@@ -215,7 +215,7 @@ void BRepFeat_MakePrism::Perform(const Standard_Real Length)
 //construction of prism of height Length

  LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
  
 // management of descendants
  MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
@@ -325,7 +325,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)

 // construction of long prism
  LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();

 // in case of support of face Until
  if(!Trf) {    
@@ -366,7 +366,7 @@ void BRepFeat_MakePrism::Perform(const TopoDS_Shape& Until)
      UpdateDescendants(trP, trP.Shape(), Standard_False);
      //
      TopExp_Explorer ex(trP.Shape(), TopAbs_SOLID);
-      const TopoDS_Shape& Cutsh = ex.Current();
+      TopoDS_Shape Cutsh = ex.Current();
      if (myFuse == 1 && !myJustFeat) {
        BRepAlgoAPI_Fuse f(mySbase, Cutsh);
        myShape = f.Shape();
@@ -591,7 +591,7 @@ void BRepFeat_MakePrism::PerformUntilEnd()
  gp_Vec V(2*Height*myDir);
  
  LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
  
  MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
  
@@ -651,7 +651,7 @@ void BRepFeat_MakePrism::PerformFromEnd(const TopoDS_Shape& Until)
  gp_Vec Vtra(-3*Height*sens/2.*myDir);
  gp_Vec Vect(3*sens*Height*myDir);
  LocOpe_Prism thePrism(myPbase,Vect,Vtra);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
  
  if(!Trf) {  // case face until 
    MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
@@ -775,7 +775,7 @@ void BRepFeat_MakePrism::PerformThruAll()
  gp_Vec V(3*Height*myDir);
  gp_Vec Vtra(-3*Height/2.*myDir);
  LocOpe_Prism thePrism(myPbase,V,Vtra);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();
  MajMap(myPbase,thePrism,myMap,myFShape,myLShape);

  myGShape = VraiPrism;
@@ -830,7 +830,7 @@ void BRepFeat_MakePrism::PerformUntilHeight(const TopoDS_Shape& Until,
  Standard_Integer sens = SensOfPrism(C, mySUntil);
  gp_Vec V(sens*Length*myDir);
  LocOpe_Prism thePrism(myPbase,V);
-  const TopoDS_Shape& VraiPrism = thePrism.Shape();
+  TopoDS_Shape VraiPrism = thePrism.Shape();

  if(!Trf) {
    MajMap(myPbase,thePrism,myMap,myFShape,myLShape);
@@ -978,7 +978,7 @@ static Standard_Real HeightMax(const TopoDS_Shape& theSbase,
 //function : SensOfPrism
 //purpose  : Direction of the prism depending on the shape Until
 //=======================================================================
-Standard_Integer SensOfPrism(const Handle(Geom_Curve)& C,
+Standard_Integer SensOfPrism(const Handle(Geom_Curve) C,
 			     const TopoDS_Shape& Until)
 {
  LocOpe_CSIntersector ASI1(Until);
--- a/src/BRepFeat/BRepFeat_MakeRevol.cxx
+++ b/src/BRepFeat/BRepFeat_MakeRevol.cxx
@@ -353,7 +353,7 @@ void BRepFeat_MakeRevol::Perform(const TopoDS_Shape& Until)
    myGShape = VraiRevol;
    GeneratedShapeValid();

-    const TopoDS_Shape& Base = theRevol.FirstShape();
+    TopoDS_Shape Base = theRevol.FirstShape();
    exp.Init(Base, TopAbs_FACE);
    TopoDS_Face theBase = TopoDS::Face(exp.Current());
    exp.Next();
@@ -633,7 +633,7 @@ void BRepFeat_MakeRevol::PerformUntilAngle(const TopoDS_Shape& Until,
    myGShape = VraiRevol;
    GeneratedShapeValid();

-    const TopoDS_Shape& Base = theRevol.FirstShape();
+    TopoDS_Shape Base = theRevol.FirstShape();
    exp.Init(Base, TopAbs_FACE);
    TopoDS_Face theBase = TopoDS::Face(exp.Current());
    exp.Next();
@@ -732,7 +732,7 @@ static void VerifGluedFaces(const TopoDS_Face& theSkface,
  TopTools_DataMapOfShapeShape& theMap)
 {
  Standard_Boolean GluedFaces = Standard_True;
-  const TopoDS_Shape& VraiRevol = theRevol.Shape();
+  TopoDS_Shape VraiRevol = theRevol.Shape();

  TColGeom_SequenceOfCurve scur;
  theRevol.Curves(theCurves);
--- a/src/BRepFill/BRepFill.cxx
+++ b/src/BRepFill/BRepFill.cxx
@@ -986,8 +986,8 @@ TopoDS_Wire BRepFill::InsertACR(const TopoDS_Wire& wire,
      }
    }

-    const TopoDS_Edge& E = anExp.Current();
-    const TopoDS_Vertex& V = anExp.CurrentVertex();
+    TopoDS_Edge E = anExp.Current();
+    TopoDS_Vertex V = anExp.CurrentVertex();

    if (ndec==0 || BRep_Tool::Degenerated(E)) {
      // copy the edge
--- a/src/BRepFill/BRepFill_AdvancedEvolved.cxx
+++ b/src/BRepFill/BRepFill_AdvancedEvolved.cxx
@@ -44,8 +44,6 @@
 #include <BRepGProp_Face.hxx>
 #include <BRep_TEdge.hxx>
 #include <ShapeUpgrade_UnifySameDomain.hxx>
-#include <Bnd_Box.hxx>
-#include <BRepBndLib.hxx>

 #ifdef BRepFill_AdvancedEvolved_DEBUG
 #include <BinTools.hxx>
@@ -526,14 +524,9 @@ void BRepFill_AdvancedEvolved::GetLids()
    return;
  }

-  Standard_Real aTol = Max(aFS.Tolerance(), aFS.ToleranceReached());
-  aTol += myFuzzyValue;
-  Bnd_Box aProfBox;
-  BRepBndLib::Add(myProfile, aProfBox);
-  Standard_Real aSqDiag = aProfBox.SquareExtent();
  //Square of the default angular tolerance in
  //BOPAlgo_Tools::EdgesToWires(...) and BOPAlgo_Tools::WiresToFaces(...) methods
-  const Standard_Real aSqAnguarTol = aTol*aTol / aSqDiag;
+  const Standard_Real aSqAnguarTol = 1.0e-16;
  const gp_Dir &aNormal = aSurf->Position().Direction();

  // Obtain free-edges from myPipeShell. All edges must be planar
@@ -548,7 +541,6 @@ void BRepFill_AdvancedEvolved::GetLids()
  gp_Pnt aPtmp;
  gp_Vec aTan;

-  Standard_Real aDPMax = 0.;
  for (Standard_Integer i = 1; i <= aMapEF.Size(); i++)
  {
    TopTools_ListOfShape& aListF = aMapEF(i);
@@ -572,8 +564,6 @@ void BRepFill_AdvancedEvolved::GetLids()
      continue;

    const Standard_Real aDP = aTan.XYZ().Dot(aNormal.XYZ());
-    if (Abs(aDP) > aDPMax)
-      aDPMax = Abs(aDP);
    if (aDP*aDP>aSqModulus*aSqAnguarTol)
    {
      //Only planar edges are considered
@@ -604,9 +594,8 @@ void BRepFill_AdvancedEvolved::GetLids()
  aBB.MakeCompound(aCompW);
  aBB.MakeCompound(aCompF);
  aBB.MakeCompound(myTopBottom);
-  Standard_Real anAngTol = Sqrt(aSqAnguarTol);
-  BOPAlgo_Tools::EdgesToWires(aFreeEdges, aCompW, Standard_True, anAngTol);
-  BOPAlgo_Tools::WiresToFaces(aCompW, aCompF, anAngTol);
+  BOPAlgo_Tools::EdgesToWires(aFreeEdges, aCompW, Standard_True);
+  BOPAlgo_Tools::WiresToFaces(aCompW, aCompF);

  {
    // Check orientation
--- a/src/BRepFill/BRepFill_CompatibleWires.cxx
+++ b/src/BRepFill/BRepFill_CompatibleWires.cxx
@@ -128,7 +128,7 @@ static void AddNewEdge(const TopoDS_Shape& theEdge,
    const TopTools_SequenceOfShape& NewEdges = theEdgeNewEdges(theEdge);
    for (Standard_Integer i = 1; i <= NewEdges.Length(); i++)
    {
-      const TopoDS_Shape& anEdge = NewEdges(i);
+      TopoDS_Shape anEdge = NewEdges(i);
      AddNewEdge(anEdge, theEdgeNewEdges, ListNewEdges);
    }
  }
@@ -140,9 +140,10 @@ static void SeqOfVertices (const TopoDS_Wire&   W,
 			   TopTools_SequenceOfShape& S)
 {
  S.Clear();
-  Standard_Integer jj;
+  Standard_Integer jj, cpt = 0;
  TopExp_Explorer PE;
  for (PE.Init(W,TopAbs_VERTEX); PE.More(); PE.Next()) {
+    cpt++;
    Standard_Boolean trouve=Standard_False;
    for (jj=1;jj<=S.Length() && (!trouve);jj++) {
      if (S.Value(jj).IsSame(PE.Current())) trouve = Standard_True; 
@@ -350,10 +351,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
    for (j=1; j<=ndec; j++) {
      // piece of edge  
      m1 = (CutValues.Value(j)-t0)*(last-first)/(t1-t0)+first;
-      if (Abs(m0 - m1) < Precision::Confusion())
-      {
-        return;
-      }
      TopoDS_Edge CutE = BRepLib_MakeEdge(C,V0,Vbid,m0,m1);
      CutE.Orientation(CurrentOrient);
      S.Append(CutE);
@@ -361,10 +358,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
      V0 = TopExp::LastVertex(CutE);
      if (j==ndec) {
 	// last piece
-        if (Abs(m0 - last) < Precision::Confusion())
-        {
-          return;
-        }
 	TopoDS_Edge LastE = BRepLib_MakeEdge(C,V0,Vl,m0,last);
 	LastE.Orientation(CurrentOrient);
 	S.Append(LastE);
@@ -378,10 +371,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
    for (j=ndec; j>=1; j--) {
      // piece of edge  
      m0 = (CutValues.Value(j)-t0)*(last-first)/(t1-t0)+first;
-      if (Abs(m0 - m1) < Precision::Confusion())
-      {
-        return;
-      }
      TopoDS_Edge CutE = BRepLib_MakeEdge(C,Vbid,V1,m0,m1);
      CutE.Orientation(CurrentOrient);
      S.Append(CutE);
@@ -389,10 +378,6 @@ static void TrimEdge (const TopoDS_Edge&              CurrentEdge,
      V1 = TopExp::FirstVertex(CutE);
      if (j==1) {
 	// last piece
-        if (Abs(first - m1) < Precision::Confusion())
-        {
-          return;
-        }
 	TopoDS_Edge LastE = BRepLib_MakeEdge(C,Vf,V1,first,m1);
 	LastE.Orientation(CurrentOrient);
 	S.Append(LastE);
@@ -562,10 +547,6 @@ static Standard_Boolean EdgeIntersectOnWire (const gp_Pnt& P1,
 	  SR.Clear();
 	  SR.Append(param);
 	  TrimEdge(E,SR,first,last,SO,SE);
-          if (SE.IsEmpty())
-          {
-            return Standard_False;
-          }
          theEdgeNewEdges(E) = SE;
 	  TopoDS_Vertex VV1,VV2;
 	  TopExp::Vertices(TopoDS::Edge(SE.Value(1)),VV1,VV2);
@@ -675,7 +656,7 @@ static void BuildConnectedEdges(const TopoDS_Wire& aWire,
 //=======================================================================

 BRepFill_CompatibleWires::BRepFill_CompatibleWires() 
-:myStatus(BRepFill_ThruSectionErrorStatus_NotDone)
+:myIsDone(Standard_False)
 {
 }

@@ -700,8 +681,8 @@ void BRepFill_CompatibleWires::Init(const TopTools_SequenceOfShape& Sections)
 {
  myInit = Sections;
  myWork = Sections;
-  myPercent = 0.1;
-  myStatus = BRepFill_ThruSectionErrorStatus_NotDone;
+  myPercent = 0.01;
+  myIsDone = Standard_False;
  myMap.Clear();

 }
@@ -726,7 +707,7 @@ void BRepFill_CompatibleWires::SetPercent(const Standard_Real Percent)

 Standard_Boolean BRepFill_CompatibleWires::IsDone() const 
 {
-  return myStatus == BRepFill_ThruSectionErrorStatus_Done;
+  return myIsDone;
 }


@@ -785,7 +766,6 @@ Standard_Boolean BRepFill_CompatibleWires::IsDegeneratedLastSection() const

 void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
 {
-  myStatus = BRepFill_ThruSectionErrorStatus_Done;
  // compute origin and orientation on wires to avoid twisted results
  // and update wires to have same number of edges

@@ -818,6 +798,7 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
  report = (nbmax != nbmin || contS >= GeomAbs_C1 );
  
  // initialization of the map
+  Standard_Integer nbE = 0;
  TopTools_ListOfShape Empty;
  for (i=1; i<=nbSects; i++) {
    TopoDS_Wire W = TopoDS::Wire(myWork(i));
@@ -825,6 +806,7 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
      TopoDS_Edge E = TopoDS::Edge(anExp.Current());
      myMap.Bind(E,Empty);
      myMap(E).Append(E);
+      nbE++;
    }
  } 
  
@@ -856,7 +838,7 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
    allClosed = (allClosed && wClosed);
    allOpen = (allOpen && !wClosed);
  }
-
+  
  if (allClosed) {
    // All sections are closed 
    if (report) {
@@ -867,26 +849,24 @@ void BRepFill_CompatibleWires::Perform (const Standard_Boolean WithRotation)
      // origin
      ComputeOrigin(Standard_False);
    }
+    myIsDone = Standard_True;
  }
  else if (allOpen) {
    // All sections are open
    // origin
    SearchOrigin();
-    if (myStatus != BRepFill_ThruSectionErrorStatus_Done)
-    {
-      return;
-    }
    // same number of elements
    if (report) {
      SameNumberByACR(report);
    }
+    myIsDone = Standard_True;
  }
  else {
    // There are open and closed sections :
    // not processed
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
+    throw Standard_DomainError("Sections must be all closed or all open");
  }
+  
 }


@@ -926,10 +906,7 @@ void BRepFill_CompatibleWires::
    //allClosed = (allClosed && myWork(i).Closed());
  }
  if (!allClosed)
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SameNumberByPolarMethod : the wires must be closed");
  
  // sections ponctuelles, sections bouclantes ?
  if (myDegen1) ideb++;
@@ -1009,11 +986,8 @@ void BRepFill_CompatibleWires::
    
    // sequence of vertices of the first wire
    SeqOfVertices(wire1,SeqV);
-    if (SeqV.Length() > NbMaxV)
-    {
-      myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-      return;
-    }
+    if (SeqV.Length()>NbMaxV) 
+      throw Standard_NoSuchObject("BRepFill::SameNumberByPolarMethod failed");
    
    // loop on vertices of wire1
    for (ii=1;ii<=SeqV.Length();ii++) {
@@ -1088,10 +1062,7 @@ void BRepFill_CompatibleWires::
    // sequence of vertices of the first wire
    SeqOfVertices(wire1,SeqV);
    if ( SeqV.Length()>NbMaxV || SeqV.Length()>SizeMap ) 
-    {
-      myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-      return;
-    }
+      throw Standard_NoSuchObject("BRepFill::SameNumberByPolarMethod failed");
    

    // next wire 
@@ -1213,17 +1184,14 @@ void BRepFill_CompatibleWires::
 	}
      } //end of for(; itW.More(); itW.Next())
    if (Esol.IsNull())
-    {
-      myStatus = BRepFill_ThruSectionErrorStatus_ProfilesInconsistent;
-      return;
-    }
+      throw Standard_ConstructionError("BRepFill :: profiles are inconsistent");
    MW.Add(Esol);

    TopTools_ListOfShape ConnectedEdges;
    BuildConnectedEdges( TopoDS::Wire(myWork(i)), Esol, V2, ConnectedEdges );

    TopTools_ListIteratorOfListOfShape itCE(ConnectedEdges);
-    for(; anExp.More() && itCE.More(); anExp.Next(), itCE.Next())
+    for(; anExp.More(), itCE.More(); anExp.Next(), itCE.Next())
      {
 	ECur = anExp.Current();
 	TopExp::Vertices(ECur,VF,VL,Standard_True);
@@ -1296,17 +1264,15 @@ void BRepFill_CompatibleWires::
    if (nbmax<nbEdges) nbmax = nbEdges;
    if (nbmin>nbEdges) nbmin = nbEdges;
  }
-  if (nbmin!=nbmax) 
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-    return;
+  if (nbmin!=nbmax) {
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SameNumberByPolarMethod failed");
  }

  //Fill <myMap>
  TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmap(myMap);
  for (; itmap.More(); itmap.Next())
  {
-    const TopoDS_Shape& anEdge = itmap.Key();
+    TopoDS_Shape anEdge = itmap.Key();
    TopTools_ListOfShape ListOfNewEdges;

    //for each edge of <myMap> find all newest edges
@@ -1471,11 +1437,15 @@ void BRepFill_CompatibleWires::SameNumberByACR(const  Standard_Boolean  report)
 	    TopTools_DataMapIteratorOfDataMapOfShapeListOfShape itmap;
 	    //TopTools_ListIteratorOfListOfShape itlist;
 	    TopoDS_Edge Ancestor;
+	    Standard_Integer nbedge, nblist=0;
 	    Standard_Boolean found = Standard_False;

 	    for (itmap.Initialize(myMap);itmap.More()&&(!found);itmap.Next()) {
+	      nblist++;
 	      TopTools_ListIteratorOfListOfShape itlist(itmap.Value());
+	      nbedge = 0;
 	      while (itlist.More()&&(!found)) {
+		nbedge++;
 		TopoDS_Edge ECur = TopoDS::Edge(itlist.Value());
 		    
 		if (Ecur.IsSame(ECur)) {
@@ -1517,10 +1487,7 @@ void BRepFill_CompatibleWires::SameNumberByACR(const  Standard_Boolean  report)
    if (nbmin>nbEdges(i)) nbmin = nbEdges(i);
  }
  if (nbmax!=nbmin) 
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_Failed;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SameNumberByACR failed");
 }

 //=======================================================================
@@ -1565,10 +1532,7 @@ void BRepFill_CompatibleWires::ComputeOrigin(const  Standard_Boolean /*polar*/ )
  }
 */
  if (!allClosed) 
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::ComputeOrigin : the wires must be closed");

 /*  
  // Max number of possible cuts
@@ -1905,10 +1869,7 @@ void BRepFill_CompatibleWires::ComputeOrigin(const  Standard_Boolean /*polar*/ )
      gp_Pnt Pmini,P1,P2;
      SeqOfVertices(wire,SeqV);
      if (SeqV.Length()>NbMaxV) 
-      {
-        myStatus = BRepFill::ThruSectionsError_Failed;
-        return;
-      }
+	throw Standard_NoSuchObject("BRepFill::ComputeOrigin failed");
      if (!polar) {
 	// choix du vertex le plus proche comme origine
 	distmini = Precision::Infinite();
@@ -2133,10 +2094,7 @@ void BRepFill_CompatibleWires::SearchOrigin()
    allOpen = (allOpen && !myWork(i).Closed());
  }
  if (!allOpen)
-  {
-    myStatus = BRepFill_ThruSectionErrorStatus_NotSameTopology;
-    return;
-  }
+    throw Standard_NoSuchObject("BRepFill_CompatibleWires::SearchOrigin : the wires must be open");

  // init

--- a/src/BRepFill/BRepFill_CompatibleWires.hxx
+++ b/src/BRepFill/BRepFill_CompatibleWires.hxx
@@ -20,7 +20,6 @@
 #include <Standard.hxx>
 #include <Standard_DefineAlloc.hxx>

-#include <BRepFill_ThruSectionErrorStatus.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
@@ -50,11 +49,6 @@ public:
  Standard_EXPORT void Perform (const Standard_Boolean WithRotation = Standard_True);
  
  Standard_EXPORT Standard_Boolean IsDone() const;
-
-  BRepFill_ThruSectionErrorStatus GetStatus() const
-  {
-    return myStatus;
-  }
  
  //! returns the generated sequence.
  Standard_EXPORT const TopTools_SequenceOfShape& Shape() const;
@@ -107,7 +101,7 @@ private:
  Standard_Real myPercent;
  Standard_Boolean myDegen1;
  Standard_Boolean myDegen2;
-  BRepFill_ThruSectionErrorStatus myStatus;
+  Standard_Boolean myIsDone;
  TopTools_DataMapOfShapeListOfShape myMap;


--- a/Show More
+++ b/Show More