Revision: 15950
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15950
Author: jaguarandi
Date: 2008-08-04 16:27:25 +0200 (Mon, 04 Aug 2008)
Log Message:
-----------
Made shrinkwrap variables be initialized when declared
Modified Paths:
--------------
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
2008-08-04 14:17:11 UTC (rev 15949)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_shrinkwrap.h
2008-08-04 14:27:25 UTC (rev 15950)
@@ -136,7 +136,12 @@
struct DerivedMesh *shrinkwrapModifier_do(struct ShrinkwrapModifierData *smd,
struct Object *ob, struct DerivedMesh *dm, int useRenderParams, int
isFinalCalc);
void shrinkwrapModifier_deform(struct ShrinkwrapModifierData *smd, struct
Object *ob, struct DerivedMesh *dm, float (*vertexCos)[3], int numVerts);
+#define NULL_ShrinkwrapCalcData {NULL, }
+#define NULL_BVHTreeFromMesh {NULL, }
+#define NULL_BVHTreeRayHit {NULL, }
+#define NULL_BVHTreeNearest {NULL, }
+
#endif
Modified:
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
===================================================================
--- branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-08-04 14:17:11 UTC (rev 15949)
+++ branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/shrinkwrap.c
2008-08-04 14:27:25 UTC (rev 15950)
@@ -973,8 +973,7 @@
void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob,
DerivedMesh *dm, float (*vertexCos)[3], int numVerts)
{
- ShrinkwrapCalcData calc;
- memset(&calc, 0, sizeof(calc));
+ ShrinkwrapCalcData calc = NULL_ShrinkwrapCalcData;
//Init Shrinkwrap calc data
calc.smd = smd;
@@ -1050,8 +1049,8 @@
int vgroup = get_named_vertexgroup_num(calc->ob,
calc->smd->vgroup_name);
float *co;
- BVHTreeFromMesh treeData;
- BVHTreeNearest nearest;
+ BVHTreeFromMesh treeData = NULL_BVHTreeFromMesh;
+ BVHTreeNearest nearest = NULL_BVHTreeNearest;
MDeformVert *dvert = calc->original ?
calc->original->getVertDataArray(calc->original, CD_MDEFORMVERT) : NULL;
@@ -1109,6 +1108,8 @@
float tmp_co[3], tmp_no[3];
const float *co, *no;
BVHTreeRayHit hit_tmp;
+
+ //Copy from hit (we need to convert hit rays from one space coordinates
to the other
memcpy( &hit_tmp, hit, sizeof(hit_tmp) );
//Apply space transform (TODO readjust dist)
@@ -1167,12 +1168,12 @@
float *co;
//setup raytracing
- BVHTreeFromMesh treeData;
- BVHTreeRayHit hit;
+ BVHTreeFromMesh treeData = NULL_BVHTreeFromMesh;
+ BVHTreeRayHit hit = NULL_BVHTreeRayHit;
//cutTree
DerivedMesh * limit_mesh = NULL;
- BVHTreeFromMesh limitData;
+ BVHTreeFromMesh limitData= NULL_BVHTreeFromMesh;
SpaceTransform local2cut;
MVert *vert = calc->original ?
calc->original->getVertDataArray(calc->original, CD_MVERT) : NULL;
//Needed because of vertex normal
@@ -1276,8 +1277,8 @@
int vgroup = get_named_vertexgroup_num(calc->ob,
calc->smd->vgroup_name);
float *co;
- BVHTreeFromMesh treeData;
- BVHTreeNearest nearest;
+ BVHTreeFromMesh treeData = NULL_BVHTreeFromMesh;
+ BVHTreeNearest nearest = NULL_BVHTreeNearest;
MDeformVert *dvert = calc->original ?
calc->original->getVertDataArray(calc->original, CD_MDEFORMVERT) : NULL;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
