archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Avoid type re-definition for as long C11 is explicitly enabled in compilers

Browse Source
This commit is contained in:
Sergey Sharybin
2015-01-12 15:36:18 +05:00
parent 9d02e2626b
commit 47e47e6760
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/BKE_customdata.h
View File

@@ -373,10 +373,10 @@ void CustomData_external_reload(struct CustomData *data,
/* Mesh-to-mesh transfer data. */
struct MeshPairRemap;
typedef struct CustomDataTransferLayerMap CustomDataTransferLayerMap;
struct CustomDataTransferLayerMap;
typedef void (*cd_datatransfer_interp)(
const CustomDataTransferLayerMap *laymap, void *dest,
const struct CustomDataTransferLayerMap *laymap, void *dest,
void **sources, const float *weights, const int count, const float mix_factor);
/**
@@ -423,7 +423,7 @@ enum {
};
typedef struct CustomDataTransferLayerMap {
CustomDataTransferLayerMap *next, *prev;
struct CustomDataTransferLayerMap *next, *prev;
int data_type;
int mix_mode;