Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-01-12 13:36:18 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-01-12 13:36:18 +0300
commit47e47e676099dc79e64af7730f157e988e43c5ba (patch)
tree0d43386024d03add61b1211d49b1f09757cb89cf
parent9d02e2626bdec0b230cb71103822c773979c516e (diff)
Avoid type re-definition for as long C11 is explicitly enabled in compilers
-rw-r--r--source/blender/blenkernel/BKE_customdata.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h
index 08edde1cec0..f11aad27e4b 100644
--- a/source/blender/blenkernel/BKE_customdata.h
+++ b/source/blender/blenkernel/BKE_customdata.h
@@ -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;