diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-13 23:17:32 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-13 23:19:50 +0300 |
| commit | b1ed12bfec529f61ee06560d05b8fcb144382fcf (patch) | |
| tree | d795e1642b0cee0df823dc68ecfa0ae6bf2b828c /source/blender/blenkernel/intern/data_transfer_intern.h | |
| parent | 1c81bcffde7a2533a9e8e8bc05c9ef7f24588309 (diff) | |
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 :)
Diffstat (limited to 'source/blender/blenkernel/intern/data_transfer_intern.h')
| -rw-r--r-- | source/blender/blenkernel/intern/data_transfer_intern.h | 7 |
1 files changed, 2 insertions, 5 deletions
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, |