griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Compiler warning fixes (how some of this stuff compiled without stopping compiling I don't know) ;)

Browse Source
This commit is contained in:
Joshua Leung
2008-07-08 07:30:38 +00:00
parent 22e87792f1
commit 878a5303f3
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_bmeshCustomData.h
View File

@@ -38,7 +38,7 @@
#ifndef BKE_BMESHCUSTOMDATA_H
#define BKE_BMESHCUSTOMDATA_H
struct BME_mempool;
struct BLI_mempool;
/*Custom Data Types and defines
Eventual plan is to move almost everything to custom data and let caller
@@ -62,7 +62,7 @@ typedef struct BME_CustomDataLayer {
typedef struct BME_CustomData {
struct BME_CustomDataLayer *layers; /*Custom Data Layers*/
struct BME_mempool *pool; /*pool for alloc of blocks*/
struct BLI_mempool *pool; /*pool for alloc of blocks*/
int totlayer, totsize; /*total layers and total size in bytes of each block*/
} BME_CustomData;

9
source/blender/blenkernel/intern/BME_Customdata.c
View File

@@ -40,6 +40,7 @@
#include "bmesh_private.h"
#include <string.h>
#include "MEM_guardedalloc.h"
#include "BLI_mempool.h"
/********************* Layer type information **********************/
typedef struct BME_LayerTypeInfo {
@@ -83,7 +84,7 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc
if(data->totlayer){
/*alloc memory*/
data->layers = MEM_callocN(sizeof(BME_CustomDataLayer)*data->totlayer, "BMesh Custom Data Layers");
data->pool = BME_mempool_create(data->totsize, initalloc, initalloc);
data->pool = BLI_mempool_create(data->totsize, initalloc, initalloc);
/*initialize layer data*/
for(i=0; i < BME_CD_NUMTYPES; i++){
if(init->layout[i]){
@@ -102,7 +103,7 @@ void BME_CD_Create(BME_CustomData *data, BME_CustomDataInit *init, int initalloc
void BME_CD_Free(BME_CustomData *data)
{
if(data->pool) BME_mempool_destroy(data->pool);
if(data->pool) BLI_mempool_destroy(data->pool);
}
/*Block level ops*/
@@ -119,7 +120,7 @@ void BME_CD_free_block(BME_CustomData *data, void **block)
typeInfo->free((char*)*block + offset, 1, typeInfo->size);
}
}
BME_mempool_free(data->pool, *block);
BLI_mempool_free(data->pool, *block);
*block = NULL;
}
@@ -130,7 +131,7 @@ static void BME_CD_alloc_block(BME_CustomData *data, void **block)
if (*block) BME_CD_free_block(data, block); //if we copy layers that have their own free functions like deformverts
if (data->totsize > 0)
*block = BME_mempool_alloc(data->pool);
*block = BLI_mempool_alloc(data->pool);
else
*block = NULL;
}

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

@@ -523,6 +523,7 @@ static void bvh_div_nodes(BVHTree *tree, BVHNode *node, int start, int end, char
return;
}
#if 0
static void verify_tree(BVHTree *tree)
{
int i, j, check = 0;
@@ -569,6 +570,7 @@ static void verify_tree(BVHTree *tree)
printf("branches: %d, leafs: %d, total: %d\n", tree->totbranch, tree->totleaf, tree->totbranch + tree->totleaf);
}
#endif
void BLI_bvhtree_balance(BVHTree *tree)
{

2
source/blender/src/editsima.c
View File

@@ -694,7 +694,7 @@ void mouse_select_sima(void)
EditFace *efa;
MTFace *tf, *nearesttf;
EditFace *nearestefa=NULL;
int a, selectsticky, edgeloop, actface, nearestuv, nearestedge, i, shift, island;
int a, selectsticky, edgeloop, actface, nearestuv, nearestedge, i, shift, island=0;
char sticky= 0;
int flush = 0; /* 0 == dont flush, 1 == sel, -1 == desel; only use when selection sync is enabled */
unsigned int hitv[4], nearestv;

2
source/blender/src/view.c
View File

@@ -1154,7 +1154,7 @@ void viewmoveNDOF(int mode)
float q1[4];
float obofs[3];
float reverse;
float diff[4];
//float diff[4];
float d, curareaX, curareaY;
float mat[3][3];
float upvec[3];