Sculpt dyntopo:

* Fixed multires apply base feeding bad original coordinates to
  deform modifiers.
* Roughed out some code for cache performance testing.
* Wrote skeleton code for a PBVH texel API; hasn't been tested
  yet and may be removed.

1 files changed, 72 insertions, 0 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 21d12147c2c..953e670e892 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -235,6 +235,7 @@ set(SRC
   intern/particle_system.c
   intern/pbvh.c
   intern/pbvh_bmesh.c
+  intern/pbvh_displacement.c
   intern/pointcache.c
   intern/pointcloud.cc
   intern/preferences.c
@@ -792,3 +793,74 @@ if(WITH_GTESTS)
   include(GTestTesting)
   blender_add_test_lib(bf_blenkernel_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB}")
 endif()
+
+
+set(PBVH_CACHE_TEST_INC
+  .
+  ../blenfont
+  ../blenlib
+  ../blenloader
+  ../blentranslation
+  ../bmesh
+  ../depsgraph
+  ../draw
+  ../functions
+  ../gpencil_modifiers
+  ../gpu
+  ../ikplugin
+  ../imbuf
+  ../makesdna
+  ../makesrna
+  ../modifiers
+  ../nodes
+  ../render
+  ../sequencer
+  ../shader_fx
+  ../simulation
+  ../../../intern/eigen
+  ../../../intern/ghost
+  ../../../intern/glew-mx
+  ../../../intern/guardedalloc
+  ../../../intern/iksolver/extern
+  ../../../intern/atomic
+  ../../../intern/clog
+  ../../../intern/libmv
+  ../../../intern/mantaflow/extern
+  ../../../intern/memutil
+  ../../../intern/mikktspace
+  ../../../intern/opensubdiv
+  ../../../extern/curve_fit_nd
+)
+
+set(PBVH_CACHE_TEST_SRC
+  intern/pbvh_cache_test_main.c
+)
+
+setup_libdirs()
+
+add_executable(pbvh_cache_test ${PBVH_CACHE_TEST_SRC} ${PBVH_CACHE_TEST_INC})
+setup_platform_linker_flags(pbvh_cache_test)
+
+target_link_libraries(pbvh_cache_test bf_blenkernel bf_bmesh bf_intern_ghost bf_blenlib bf_intern_guardedalloc)
+
+if(WIN32)
+  set_target_properties(pbvh_cache_test PROPERTIES VS_GLOBAL_VcpkgEnabled "false")
+  set_target_properties(pbvh_cache_test PROPERTIES
+    PDB_NAME "pbvh_cache_test_private"
+    PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>")
+    if(WITH_WINDOWS_PDB AND WITH_WINDOWS_STRIPPED_PDB)
+      # This is slightly messy, but single target generators like ninja will not have the
+      # CMAKE_CFG_INTDIR variable and multitarget generators like msbuild will not have
+      # CMAKE_BUILD_TYPE. This can be simplified by target_link_options and the $<CONFIG>
+      # generator expression in newer cmake (2.13+) but until that time this fill have suffice.
+      if(CMAKE_BUILD_TYPE)
+        set_property(TARGET pbvh_cache_test APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/pbvh_cache_test_public.pdb")
+      else()
+        set_property(TARGET pbvh_cache_test APPEND_STRING PROPERTY LINK_FLAGS  " /PDBSTRIPPED:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/pbvh_cache_test_public.pdb")
+      endif()
+  endif()
+endif()
+
+if (WIN32)
+target_link_libraries(pbvh_cache_test Vfw32.lib Imm32.lib Version.lib Comctl32.lib Shcore.lib Pathcch.lib)
+endif()