[Bf-blender-cvs] [05f500580b6] geometry-nodes-level-set-nodes: Attempt temporary workaround for build issue
Hans Goudey
noreply at git.blender.org
Thu Sep 9 05:51:08 CEST 2021
Commit: 05f500580b6f0e5bdad5f432e1734b639b47816e
Author: Hans Goudey
Date: Wed Sep 8 22:50:54 2021 -0500
Branches: geometry-nodes-level-set-nodes
https://developer.blender.org/rB05f500580b6f0e5bdad5f432e1734b639b47816e
Attempt temporary workaround for build issue
===================================================================
M source/blender/blenkernel/BKE_lib_id.h
M source/blender/blenkernel/intern/lib_id.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h
index 7fa21cc0656..2de523adb26 100644
--- a/source/blender/blenkernel/BKE_lib_id.h
+++ b/source/blender/blenkernel/BKE_lib_id.h
@@ -46,6 +46,7 @@
*/
#include "BLI_compiler_attrs.h"
+#include "DNA_userdef_types.h"
#ifdef __cplusplus
extern "C" {
@@ -261,7 +262,7 @@ struct ID *BKE_id_copy_ex(struct Main *bmain,
const int flag);
struct ID *BKE_id_copy_for_duplicate(struct Main *bmain,
struct ID *id,
- const uint duplicate_flags);
+ const eDupli_ID_Flags duplicate_flags);
void BKE_lib_id_swap(struct Main *bmain, struct ID *id_a, struct ID *id_b);
void BKE_lib_id_swap_full(struct Main *bmain, struct ID *id_a, struct ID *id_b);
diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c
index 7e96cb127e9..cd0c3635dac 100644
--- a/source/blender/blenkernel/intern/lib_id.c
+++ b/source/blender/blenkernel/intern/lib_id.c
@@ -649,7 +649,7 @@ ID *BKE_id_copy(Main *bmain, const ID *id)
* Invokes the appropriate copy method for the block and returns the result in
* newid, unless test. Returns true if the block can be copied.
*/
-ID *BKE_id_copy_for_duplicate(Main *bmain, ID *id, const uint duplicate_flags)
+ID *BKE_id_copy_for_duplicate(Main *bmain, ID *id, const eDupli_ID_Flags duplicate_flags)
{
if (id == NULL) {
return id;
More information about the Bf-blender-cvs
mailing list