From 68331467f021e6b9c1ef2ca7de76a00293ad5c03 Mon Sep 17 00:00:00 2001 From: Martin Felis Date: Mon, 18 Apr 2022 20:02:16 +0200 Subject: [PATCH] Refactored graph evaluations. --- src/AnimGraph/AnimGraphResource.cc | 5 ++++- tests/AnimGraphEvalTests.cc | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/AnimGraph/AnimGraphResource.cc b/src/AnimGraph/AnimGraphResource.cc index f8f3089..64afb19 100644 --- a/src/AnimGraph/AnimGraphResource.cc +++ b/src/AnimGraph/AnimGraphResource.cc @@ -488,7 +488,10 @@ void AnimGraphResource::connectRuntimeNodes(AnimGraph& instance) const { // // Wire up outputs to inputs. // - if (target_socket->m_type != SocketType::SocketTypeAnimation) { + // Skip animation connections and connections to the output node as the + // pointers are already set up in AnimGraphResource::prepareGraphIOData(). + if (target_socket->m_type != SocketType::SocketTypeAnimation + && connection.target_node_index != 0) { (*target_socket->m_reference.ptr_ptr) = source_socket->m_reference.ptr; } diff --git a/tests/AnimGraphEvalTests.cc b/tests/AnimGraphEvalTests.cc index 4c253bc..6ac2968 100644 --- a/tests/AnimGraphEvalTests.cc +++ b/tests/AnimGraphEvalTests.cc @@ -121,8 +121,6 @@ TEST_CASE_METHOD( } TEST_CASE("AnimDataPlacementNew", "[AnimGraphEval]") { - std::cout << "blamp" << std::endl; - int anim_data_size = sizeof(AnimData); char* buf = new char[anim_data_size];