diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-06-09 00:08:19 +0400 |
| commit | c8b4cf92067ffeb625aa39003baf5d8f7c3f0025 (patch) | |
| tree | c6c50dbc3d90a65fca6c1ca56a93e4a57cf7e154 /source/blender/editors/armature/reeb.c | |
| parent | e93db433a086a3e739c0f4026cd500f0b595b0f1 (diff) | |
| parent | d76a6f5231c015c35123d22e1f5c3ffcdfbf9bbd (diff) | |
2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD
Notes:
* Game and sequencer RNA, and sequencer header are now out of date
a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
not needed anymore.
* Fix "duplicate strip" always increase the user count for ipo.
* IPO pinning on sequencer strips was lost during Undo.
Diffstat (limited to 'source/blender/editors/armature/reeb.c')
| -rw-r--r-- | source/blender/editors/armature/reeb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 7e6c84764ae..ea794b2c7c1 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -2702,7 +2702,7 @@ static float cotan_weight(float *v1, float *v2, float *v3) return Inpf(a, b)/clen; } -void addTriangle(EditVert *v1, EditVert *v2, EditVert *v3, long e1, long e2, long e3) +void addTriangle(EditVert *v1, EditVert *v2, EditVert *v3, int e1, int e2, int e3) { /* Angle opposite e1 */ float t1= cotan_weight(v1->co, v2->co, v3->co) / e2; |