sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Compilation error fixes for older GCC/CLang compilers

Browse Source 
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 :)
This commit is contained in:
Sergey Sharybin 2015-06-13 22:17:32 +02:00
parent 1c81bcffde
commit b1ed12bfec
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/intern/data_transfer_intern.h
View File

@ -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,

9
source/blender/blenlib/BLI_astar.h
View File

@ -86,6 +86,15 @@ void BLI_astar_solution_init(BLI_AStarGraph *as_graph, BLI_AStarSolution *as_sol
void BLI_astar_solution_clear(BLI_AStarSolution *as_solution);
void BLI_astar_solution_free(BLI_AStarSolution *as_solution);
/**
* Callback computing the current cost (distance) to next node, and the estimated overall cost to destination node
* (A* expects this estimation to always be less or equal than actual shortest path from next node to destination one).
*
* \param link the graph link between current node and next one.
* \param node_idx_curr current node index.
* \param node_idx_next next node index.
* \param node_idx_dst destination node index.
*/
typedef float (*astar_f_cost)(BLI_AStarGraph *as_graph, BLI_AStarSolution *as_solution, BLI_AStarGNLink *link,
const int node_idx_curr, const int node_idx_next, const int node_idx_dst);

12
source/blender/blenlib/intern/astar.c
View File

@ -164,18 +164,6 @@ void BLI_astar_solution_free(BLI_AStarSolution *as_solution)
}
}
/**
* Callback computing the current cost (distance) to next node, and the estimated overall cost to destination node
* (A* expects this estimation to always be less or equal than actual shortest path from next node to destination one).
*
* \param link the graph link between current node and next one.
* \param node_idx_curr current node index.
* \param node_idx_next next node index.
* \param node_idx_dst destination node index.
*/
typedef float (*astar_f_cost)(BLI_AStarGraph *as_graph, BLI_AStarSolution *as_solution, BLI_AStarGNLink *link,
const int node_idx_curr, const int node_idx_next, const int node_idx_dst);
/**
* Init an A* graph. Total number of nodes must be known.
*