[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16233] trunk/blender/source/blender: Removed cast warnings from shrinkwrap.c and BLI_kdopbvh.c
André Pinto
andresusanopinto at gmail.com
Fri Aug 22 20:28:34 CEST 2008
Revision: 16233
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16233
Author: jaguarandi
Date: 2008-08-22 20:28:34 +0200 (Fri, 22 Aug 2008)
Log Message:
-----------
Removed cast warnings from shrinkwrap.c and BLI_kdopbvh.c
Only unused functions and openmp warnings left on those.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
Modified: trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2008-08-22 15:40:41 UTC (rev 16232)
+++ trunk/blender/source/blender/blenkernel/intern/shrinkwrap.c 2008-08-22 18:28:34 UTC (rev 16233)
@@ -113,23 +113,23 @@
void space_transform_apply(const SpaceTransform *data, float *co)
{
- VecMat4MulVecfl(co, data->local2target, co);
+ VecMat4MulVecfl(co, ((SpaceTransform*)data)->local2target, co);
}
void space_transform_invert(const SpaceTransform *data, float *co)
{
- VecMat4MulVecfl(co, data->target2local, co);
+ VecMat4MulVecfl(co, ((SpaceTransform*)data)->target2local, co);
}
void space_transform_apply_normal(const SpaceTransform *data, float *no)
{
- Mat4Mul3Vecfl(data->local2target, no);
+ Mat4Mul3Vecfl( ((SpaceTransform*)data)->local2target, no);
Normalize(no); // TODO: could we just determine de scale value from the matrix?
}
void space_transform_invert_normal(const SpaceTransform *data, float *no)
{
- Mat4Mul3Vecfl(data->target2local, no);
+ Mat4Mul3Vecfl(((SpaceTransform*)data)->target2local, no);
Normalize(no); // TODO: could we just determine de scale value from the matrix?
}
@@ -291,7 +291,7 @@
space_transform_apply_normal( transf, tmp_no );
no = tmp_no;
- hit_tmp.dist *= Mat4ToScalef( transf->local2target );
+ hit_tmp.dist *= Mat4ToScalef( ((SpaceTransform*)transf)->local2target );
}
else
{
@@ -318,7 +318,7 @@
space_transform_invert( transf, hit_tmp.co );
space_transform_invert_normal( transf, hit_tmp.no );
- hit_tmp.dist = VecLenf( vert, hit_tmp.co );
+ hit_tmp.dist = VecLenf( (float*)vert, hit_tmp.co );
}
memcpy(hit, &hit_tmp, sizeof(hit_tmp) );
Modified: trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-08-22 15:40:41 UTC (rev 16232)
+++ trunk/blender/source/blender/blenlib/intern/BLI_kdopbvh.c 2008-08-22 18:28:34 UTC (rev 16233)
@@ -82,7 +82,7 @@
typedef struct BVHNearestData
{
BVHTree *tree;
- float *co;
+ const float *co;
BVHTree_NearestPointCallback callback;
void *userdata;
float proj[13]; //coordinates projection over axis
@@ -1248,7 +1248,6 @@
static void dfs_find_nearest_begin(BVHNearestData *data, BVHNode *node)
{
- int i;
float nearest[3], sdist;
sdist = calc_nearest_point(data, node, nearest);
if(sdist >= data->nearest.dist) return;
More information about the Bf-blender-cvs
mailing list