Commit: 78f29f6c0a169c3cefd415fb8fb8e5a1d9d8bf60
Author: Ankit Meel
Date: Mon Jul 27 13:38:08 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB78f29f6c0a169c3cefd415fb8fb8e5a1d9d8bf60
Fix build error due to forward enum declaration
In full build, the following error happens. So fix it by including the
definition file before the forward declaration one.
```
In file included from source/blender/io/collada/SkinInfo.cpp:40:
source/blender/blenkernel/BKE_object_deform.h:62:6: error:
enumeration previously declared with nonfixed underlying type
enum eVGroupSelect
^
In file included from source/blender/io/collada/SkinInfo.cpp:36:
source/blender/makesdna/DNA_scene_types.h:2099:14: note:
previous declaration is here
typedef enum eVGroupSelect {
^
1 error generated.
```
===================================================================
M source/blender/blenkernel/BKE_object_deform.h
M source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_object_deform.h
b/source/blender/blenkernel/BKE_object_deform.h
index 2d2f8fb3389..e4813aa2288 100644
--- a/source/blender/blenkernel/BKE_object_deform.h
+++ b/source/blender/blenkernel/BKE_object_deform.h
@@ -59,11 +59,7 @@ void BKE_object_defgroup_index_map_apply(struct MDeformVert
*dvert,
int map_len);
/* Select helpers */
-enum eVGroupSelect
-#ifdef __cplusplus
- : int
-#endif
- ;
+enum eVGroupSelect;
bool *BKE_object_defgroup_subset_from_select_type(struct Object *ob,
enum eVGroupSelect
subset_type,
int *r_defgroup_tot,
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
index 7bdfbc49654..e935da159b5 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
@@ -21,6 +21,8 @@
* \ingroup obj
*/
+#include "DNA_scene_types.h" /* For eVGroupSelect. */
+
#include "BKE_customdata.h"
#include "BKE_object_deform.h"
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
