bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fixing compile error with msvc (introducing max tree to 32)

Browse Source
This commit is contained in:
Daniel Genrich 2008-08-07 22:05:45 +00:00
parent 2edb87d90e
commit c58e27d070
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@ -43,6 +43,10 @@
#include <omp.h>
#endif
#define MAX_TREETYPE 32
typedef struct BVHNode
{
struct BVHNode **children;
@ -490,7 +494,7 @@ static void verify_tree(BVHTree *tree)
#endif
//Helper data and structures to build a min-leaf generalized implicit tree
//This code can be easily reduced (basicly this is only method to calculate pow(k, n) in O(1).. and sutff like that)
//This code can be easily reduced (basicly this is only method to calculate pow(k, n) in O(1).. and stuff like that)
typedef struct BVHBuildHelper
{
int tree_type; //
@ -648,7 +652,7 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
int k;
const int parent_level_index= j-i;
BVHNode* parent = branches_array + j;
int nth_positions[ tree_type + 1 ];
int nth_positions[ MAX_TREETYPE + 1];
char split_axis;
int parent_leafs_begin = implicit_leafs_index(&data, depth, parent_level_index);
@ -714,6 +718,9 @@ BVHTree *BLI_bvhtree_new(int maxsize, float epsilon, char tree_type, char axis)
if(tree_type < 2)
return NULL;
if(tree_type > MAX_TREETYPE)
return NULL;
tree = (BVHTree *)MEM_callocN(sizeof(BVHTree), "BVHTree");
if(tree)