Depsgraph: Remove legacy code from new depsgraph
Now we have no remaining WITH_LEGACY_DEPSGRAPH in the code.
This commit is contained in:
@@ -113,10 +113,6 @@ else()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WITH_LEGACY_DEPSGRAPH)
|
||||
add_definitions(-DWITH_LEGACY_DEPSGRAPH)
|
||||
endif()
|
||||
|
||||
if(WITH_BOOST)
|
||||
list(APPEND INC_SYS
|
||||
${BOOST_INCLUDE_DIR}
|
||||
|
||||
@@ -52,43 +52,9 @@ extern "C" {
|
||||
|
||||
#include "intern/depsgraph.h"
|
||||
|
||||
#ifdef WITH_LEGACY_DEPSGRAPH
|
||||
static bool use_legacy_depsgraph = true;
|
||||
#endif
|
||||
|
||||
/* Unfinished and unused, and takes quite some pre-processing time. */
|
||||
#undef USE_EVAL_PRIORITY
|
||||
|
||||
bool DEG_depsgraph_use_legacy(void)
|
||||
{
|
||||
#ifdef DISABLE_NEW_DEPSGRAPH
|
||||
return true;
|
||||
#elif defined(WITH_LEGACY_DEPSGRAPH)
|
||||
return use_legacy_depsgraph;
|
||||
#else
|
||||
BLI_assert(!"Should not be used with new depsgraph");
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
void DEG_depsgraph_switch_to_legacy(void)
|
||||
{
|
||||
#ifdef WITH_LEGACY_DEPSGRAPH
|
||||
use_legacy_depsgraph = true;
|
||||
#else
|
||||
BLI_assert(!"Should not be used with new depsgraph");
|
||||
#endif
|
||||
}
|
||||
|
||||
void DEG_depsgraph_switch_to_new(void)
|
||||
{
|
||||
#ifdef WITH_LEGACY_DEPSGRAPH
|
||||
use_legacy_depsgraph = false;
|
||||
#else
|
||||
BLI_assert(!"Should not be used with new depsgraph");
|
||||
#endif
|
||||
}
|
||||
|
||||
/* ****************** */
|
||||
/* Evaluation Context */
|
||||
|
||||
|
||||
@@ -38,9 +38,7 @@
|
||||
#else
|
||||
#pragma message("No available foreach() implementation. Using stub instead, disabling new depsgraph")
|
||||
|
||||
#ifndef WITH_LEGACY_DEPSGRAPH
|
||||
# error "Unable to build new depsgraph and legacy one is disabled."
|
||||
#endif
|
||||
#error "Unable to build new depsgraph and legacy one is disabled."
|
||||
|
||||
#define DISABLE_NEW_DEPSGRAPH
|
||||
|
||||
|
||||
@@ -50,9 +50,7 @@ using boost::function;
|
||||
|
||||
#pragma message("No available function binding implementation. Using stub instead, disabling new depsgraph")
|
||||
|
||||
#ifndef WITH_LEGACY_DEPSGRAPH
|
||||
# error "Unable to build new depsgraph and legacy one is disabled."
|
||||
#endif
|
||||
#error "Unable to build new depsgraph and legacy one is disabled."
|
||||
|
||||
#define DISABLE_NEW_DEPSGRAPH
|
||||
|
||||
|
||||
Reference in New Issue
Block a user