Commit: b04ec4faa5bf237928375d6c9708fe8b9bf9c48d Author: Jacques Lucke Date: Tue Aug 6 17:17:34 2019 +0200 Branches: functions https://developer.blender.org/rBb04ec4faa5bf237928375d6c9708fe8b9bf9c48d
move function to correct file =================================================================== M source/blender/functions/backends/cpp/cpp-c.cpp M source/blender/functions/backends/cpp/cpp-c.h M source/blender/functions/types/tuple_access-c.cpp M source/blender/functions/types/tuple_access-c.h =================================================================== diff --git a/source/blender/functions/backends/cpp/cpp-c.cpp b/source/blender/functions/backends/cpp/cpp-c.cpp index dfe461c771f..6e1641e2efe 100644 --- a/source/blender/functions/backends/cpp/cpp-c.cpp +++ b/source/blender/functions/backends/cpp/cpp-c.cpp @@ -31,3 +31,9 @@ void FN_list_free(FnList list_c) List *list = unwrap(list_c); list->decref(); } + +FnList FN_tuple_relocate_out_list(FnTuple tuple_c, uint index) +{ + auto list = unwrap(tuple_c)->relocate_out<SharedList>(index); + return wrap(list.extract_ptr()); +} diff --git a/source/blender/functions/backends/cpp/cpp-c.h b/source/blender/functions/backends/cpp/cpp-c.h index 329d0195b71..4d9ee1d3ed9 100644 --- a/source/blender/functions/backends/cpp/cpp-c.h +++ b/source/blender/functions/backends/cpp/cpp-c.h @@ -11,13 +11,14 @@ typedef struct OpaqueFnTuple *FnTuple; typedef struct OpaqueFnList *FnList; void FN_tuple_free(FnTuple tuple); - void fn_tuple_destruct(FnTuple tuple); uint FN_list_size(FnList list); void *FN_list_storage(FnList list); void FN_list_free(FnList list); +FnList FN_tuple_relocate_out_list(FnTuple tuple, uint index); + #ifdef __cplusplus } diff --git a/source/blender/functions/types/tuple_access-c.cpp b/source/blender/functions/types/tuple_access-c.cpp index de414fae965..9cf63669c3b 100644 --- a/source/blender/functions/types/tuple_access-c.cpp +++ b/source/blender/functions/types/tuple_access-c.cpp @@ -32,9 +32,3 @@ void FN_tuple_get_float3(FnTuple tuple_c, uint index, float dst[3]) { *(float3 *)dst = unwrap(tuple_c)->get<float3>(index); } - -FnList FN_tuple_relocate_out_list(FnTuple tuple_c, uint index) -{ - auto list = unwrap(tuple_c)->relocate_out<SharedList>(index); - return wrap(list.extract_ptr()); -} diff --git a/source/blender/functions/types/tuple_access-c.h b/source/blender/functions/types/tuple_access-c.h index 85e84fd975c..9a5d26816e7 100644 --- a/source/blender/functions/types/tuple_access-c.h +++ b/source/blender/functions/types/tuple_access-c.h @@ -15,7 +15,6 @@ void FN_tuple_set_float3(FnTuple tuple, uint index, float vector[3]); float FN_tuple_get_float(FnTuple tuple, uint index); int32_t FN_tuple_get_int32(FnTuple tuple, uint index); void FN_tuple_get_float3(FnTuple tuple, uint index, float dst[3]); -FnList FN_tuple_relocate_out_list(FnTuple tuple, uint index); #ifdef __cplusplus } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs