Revision: 15483
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15483
Author: aligorith
Date: 2008-07-08 09:30:38 +0200 (Tue, 08 Jul 2008)
Log Message:
-----------
Compiler warning fixes (how some of this stuff compiled without stopping
compiling I don't know) ;)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_bmeshCustomData.h
trunk/blender/source/blender/blenkernel/intern/BME_Customdata.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
trunk/blender/source/blender/src/editsima.c
trunk/blender/source/blender/src/view.c
Modified: trunk/blender/source/blender/blenkernel/BKE_bmeshCustomData.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_bmeshCustomData.h
2008-07-08 07:06:42 UTC (rev 15482)
+++ trunk/blender/source/blender/blenkernel/BKE_bmeshCustomData.h
2008-07-08 07:30:38 UTC (rev 15483)
@@ -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_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;
Modified: trunk/blender/source/blender/blenkernel/intern/BME_Customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/BME_Customdata.c
2008-07-08 07:06:42 UTC (rev 15482)
+++ trunk/blender/source/blender/blenkernel/intern/BME_Customdata.c
2008-07-08 07:30:38 UTC (rev 15483)
@@ -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 @@
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_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 @@
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 @@
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;
}
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-07-08
07:06:42 UTC (rev 15482)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-07-08
07:30:38 UTC (rev 15483)
@@ -523,6 +523,7 @@
return;
}
+#if 0
static void verify_tree(BVHTree *tree)
{
int i, j, check = 0;
@@ -569,6 +570,7 @@
printf("branches: %d, leafs: %d, total: %d\n", tree->totbranch,
tree->totleaf, tree->totbranch + tree->totleaf);
}
+#endif
void BLI_bvhtree_balance(BVHTree *tree)
{
Modified: trunk/blender/source/blender/src/editsima.c
===================================================================
--- trunk/blender/source/blender/src/editsima.c 2008-07-08 07:06:42 UTC (rev
15482)
+++ trunk/blender/source/blender/src/editsima.c 2008-07-08 07:30:38 UTC (rev
15483)
@@ -694,7 +694,7 @@
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;
Modified: trunk/blender/source/blender/src/view.c
===================================================================
--- trunk/blender/source/blender/src/view.c 2008-07-08 07:06:42 UTC (rev
15482)
+++ trunk/blender/source/blender/src/view.c 2008-07-08 07:30:38 UTC (rev
15483)
@@ -1154,7 +1154,7 @@
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];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
