archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

spaces -> tabs (configure you're editors right!)

Browse Source
This commit is contained in:
Campbell Barton
2011-09-01 01:48:50 +00:00
parent a22dc764bb
commit 00143a3d55
10 changed files with 147 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/collision.c
View File

@@ -1488,7 +1488,7 @@ static CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2,
sdis = clmd->coll_parms->distance_repel + epsilon2 + FLT_EPSILON; sdis = clmd->coll_parms->distance_repel + epsilon2 + FLT_EPSILON;
/* apply a repulsion force, to help the solver along. /* apply a repulsion force, to help the solver along.
this is kindof crude, it only tests one vert of the triangle*/ * this is kindof crude, it only tests one vert of the triangle */
if (isect_ray_plane_v3(cloth->verts[collpair->ap1].tx, n2, collmd->current_xnew[collpair->bp1].co, if (isect_ray_plane_v3(cloth->verts[collpair->ap1].tx, n2, collmd->current_xnew[collpair->bp1].co,
collmd->current_xnew[collpair->bp2].co, collmd->current_xnew[collpair->bp2].co,
collmd->current_xnew[collpair->bp3].co, &l, 0)) collmd->current_xnew[collpair->bp3].co, &l, 0))

6
source/blender/python/generic/bgl.c
View File

@@ -52,11 +52,9 @@ static int Buffer_len(Buffer *self);
static PyObject *Buffer_item(Buffer *self, int i); static PyObject *Buffer_item(Buffer *self, int i);
static PyObject *Buffer_slice(Buffer *self, int begin, int end); static PyObject *Buffer_slice(Buffer *self, int begin, int end);
static int Buffer_ass_item(Buffer *self, int i, PyObject *v); static int Buffer_ass_item(Buffer *self, int i, PyObject *v);
static int Buffer_ass_slice(Buffer *self, int begin, int end, static int Buffer_ass_slice(Buffer *self, int begin, int end, PyObject *seq);
PyObject *seq);
static PyObject *Buffer_subscript(Buffer *self, PyObject *item); static PyObject *Buffer_subscript(Buffer *self, PyObject *item);
static int Buffer_ass_subscript(Buffer *self, PyObject *item, static int Buffer_ass_subscript(Buffer *self, PyObject *item, PyObject *value);
PyObject *value);
static PySequenceMethods Buffer_SeqMethods = { static PySequenceMethods Buffer_SeqMethods = {
(lenfunc) Buffer_len, /*sq_length */ (lenfunc) Buffer_len, /*sq_length */