Revision: 14812
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14812
Author: jiri
Date: 2008-05-12 18:22:49 +0200 (Mon, 12 May 2008)
Log Message:
-----------
Bug fix of #10999. mbproc->start was useless.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_mball.h
trunk/blender/source/blender/blenkernel/intern/mball.c
Modified: trunk/blender/source/blender/blenkernel/BKE_mball.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_mball.h 2008-05-12 12:24:52 UTC
(rev 14811)
+++ trunk/blender/source/blender/blenkernel/BKE_mball.h 2008-05-12 16:22:49 UTC
(rev 14812)
@@ -91,7 +91,6 @@
float (*function)(float, float, float);
float size, delta; /* cube size, normal delta */
int bounds; /* cube range within
lattice */
- MB_POINT start; /* start point on surface */
CUBES *cubes; /* active cubes */
VERTICES vertices; /* surface vertices */
CENTERLIST **centers; /* cube center hash table */
Modified: trunk/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mball.c 2008-05-12
12:24:52 UTC (rev 14811)
+++ trunk/blender/source/blender/blenkernel/intern/mball.c 2008-05-12
16:22:49 UTC (rev 14812)
@@ -375,7 +375,7 @@
#define RTF 7 /* right top far corner */
/* the LBN corner of cube (i, j, k), corresponds with location
- * (start.x+(i-0.5)*size, start.y+(j-0.5)*size, start.z+(k-0.5)*size) */
+ * (i-0.5)*size, (j-0.5)*size, (k-0.5)*size) */
#define HASHBIT (5)
#define HASHSIZE (size_t)(1<<(3*HASHBIT)) /*! < hash table size (32768) */
@@ -836,11 +836,11 @@
c = (CORNER *) new_pgn_element(sizeof(CORNER));
c->i = i;
- c->x = p->start.x+((float)i-0.5f)*p->size;
+ c->x = ((float)i-0.5f)*p->size;
c->j = j;
- c->y = p->start.y+((float)j-0.5f)*p->size;
+ c->y = ((float)j-0.5f)*p->size;
c->k = k;
- c->z = p->start.z+((float)k-0.5f)*p->size;
+ c->z = ((float)k-0.5f)*p->size;
c->value = p->function(c->x, c->y, c->z);
c->next = p->corners[index];
@@ -1393,7 +1393,7 @@
c_i=
(int)floor(workp.x/mbproc->size);
c_j=
(int)floor(workp.y/mbproc->size);
c_k=
(int)floor(workp.z/mbproc->size);
-
+
/* add CUBE (with
indexes c_i, c_j, c_k) to the stack,
* this cube includes
found point of Implicit Surface */
if (ml->flag &
MB_NEGATIVE)
@@ -1403,10 +1403,8 @@
}
len =
sqrt((workp.x-in.x)*(workp.x-in.x) + (workp.y-in.y)*(workp.y-in.y) +
(workp.z-in.z)*(workp.z-in.z));
workp_v = tmp_v;
+
}
-
- mbproc->start.x= mbproc->start.y=
mbproc->start.z= 0.0;
-
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
