[Bf-blender-cvs] [b2a449e783d] functions: test if it builds on buildbot without alembic tests

Jacques Lucke noreply at git.blender.org
Mon Sep 9 11:51:53 CEST 2019


Commit: b2a449e783de686c98a0395a2e17c425e9820c9b
Author: Jacques Lucke
Date:   Mon Sep 9 11:51:35 2019 +0200
Branches: functions
https://developer.blender.org/rBb2a449e783de686c98a0395a2e17c425e9820c9b

test if it builds on buildbot without alembic tests

===================================================================

M	source/blender/blenkernel/BKE_falloff.hpp
M	source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
M	tests/gtests/CMakeLists.txt

===================================================================

diff --git a/source/blender/blenkernel/BKE_falloff.hpp b/source/blender/blenkernel/BKE_falloff.hpp
index 5a5bc3dc55e..82c4025ef0d 100644
--- a/source/blender/blenkernel/BKE_falloff.hpp
+++ b/source/blender/blenkernel/BKE_falloff.hpp
@@ -34,8 +34,6 @@ class ConstantFalloff : public Falloff {
   {
   }
 
-  virtual ~ConstantFalloff();
-
   Falloff *clone() const
   {
     return new ConstantFalloff(m_weight);
@@ -58,8 +56,6 @@ class PointDistanceFalloff : public Falloff {
   {
   }
 
-  virtual ~PointDistanceFalloff();
-
   Falloff *clone() const override
   {
     return new PointDistanceFalloff(m_point, m_min_distance, m_max_distance);
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
index e757418104f..c66806aca53 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
@@ -7,14 +7,6 @@
 
 #include "registry.hpp"
 
-BKE::ConstantFalloff::~ConstantFalloff()
-{
-}
-
-BKE::PointDistanceFalloff::~PointDistanceFalloff()
-{
-}
-
 namespace FN {
 namespace DataFlowNodes {
 
diff --git a/tests/gtests/CMakeLists.txt b/tests/gtests/CMakeLists.txt
index 142ff59e341..a04fddf07da 100644
--- a/tests/gtests/CMakeLists.txt
+++ b/tests/gtests/CMakeLists.txt
@@ -14,8 +14,8 @@ if(WITH_GTESTS)
   add_subdirectory(testing)
   add_subdirectory(blenlib)
   add_subdirectory(guardedalloc)
-  #add_subdirectory(bmesh)
-  if(WITH_ALEMBIC)
-    add_subdirectory(alembic)
-  endif()
+  # add_subdirectory(bmesh)
+  # if(WITH_ALEMBIC)
+  #   add_subdirectory(alembic)
+  # endif()
 endif()



More information about the Bf-blender-cvs mailing list