From b1ed12bfec529f61ee06560d05b8fcb144382fcf Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 13 Jun 2015 22:17:32 +0200 Subject: Compilation error fixes for older GCC/CLang compilers Avoid data type re-declaration, it's not really working on current FreeBSD's 9 system and CLang-3.0 from OSX. This is not a good idea to do such sort of copy-paste anyway. If someone knows better way of dealing with this please go ahead and correct the code :) --- source/blender/blenkernel/intern/data_transfer_intern.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source/blender/blenkernel/intern/data_transfer_intern.h') diff --git a/source/blender/blenkernel/intern/data_transfer_intern.h b/source/blender/blenkernel/intern/data_transfer_intern.h index dec27d2a056..501b749b464 100644 --- a/source/blender/blenkernel/intern/data_transfer_intern.h +++ b/source/blender/blenkernel/intern/data_transfer_intern.h @@ -31,6 +31,8 @@ #ifndef __DATA_TRANSFER_INTERN_H__ #define __DATA_TRANSFER_INTERN_H__ +#include "BKE_customdata.h" /* For cd_datatransfer_interp */ + struct CustomDataTransferLayerMap; struct CustomData; struct ListBase; @@ -38,11 +40,6 @@ struct ListBase; float data_transfer_interp_float_do( const int mix_mode, const float val_dst, const float val_src, const float mix_factor); -/* Copied from BKE_customdata.h :( */ -typedef void (*cd_datatransfer_interp)( - const struct CustomDataTransferLayerMap *laymap, void *dest, - const void **sources, const float *weights, const int count, const float mix_factor); - void data_transfer_layersmapping_add_item( struct ListBase *r_map, const int data_type, const int mix_mode, const float mix_factor, const float *mix_weights, -- cgit v1.2.3