[Bf-blender-cvs] [85980743b05] master: Cleanup: Fix build error with clang on windows.

Ray Molenkamp noreply at git.blender.org
Thu Jul 2 18:17:00 CEST 2020


Commit: 85980743b058e287f1d6400a64dcc60f87fad000
Author: Ray Molenkamp
Date:   Thu Jul 2 10:16:54 2020 -0600
Branches: master
https://developer.blender.org/rB85980743b058e287f1d6400a64dcc60f87fad000

Cleanup: Fix build error with clang on windows.

Header and implementation signature for ED_object_add_duplicate
were not the same leading to a build error with clang on windows.

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

M	source/blender/editors/include/ED_object.h

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

diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 73c58753531..e04d30892d7 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -185,7 +185,7 @@ struct Base *ED_object_add_duplicate(struct Main *bmain,
                                      struct Scene *scene,
                                      struct ViewLayer *view_layer,
                                      struct Base *base,
-                                     const uint dupflag);
+                                     const eDupli_ID_Flags dupflag);
 
 void ED_object_parent(struct Object *ob,
                       struct Object *parent,



More information about the Bf-blender-cvs mailing list