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

Cleanup: remove unused orig_nu from keyIndex ghash of editcurves.

Browse Source
This commit is contained in:
Bastien Montagne
2017-02-22 18:06:09 +01:00
parent 99947e2943
commit b637db2a7a
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/curve/editcurve.c
View File

@@ -96,7 +96,6 @@ typedef struct {
void *orig_cv; void *orig_cv;
int key_index, nu_index, pt_index, vertex_index; int key_index, nu_index, pt_index, vertex_index;
bool switched; bool switched;
Nurb *orig_nu;
} CVKeyIndex; } CVKeyIndex;
void selectend_nurb(Object *obedit, enum eEndPoint_Types selfirst, bool doswap, bool selstatus); void selectend_nurb(Object *obedit, enum eEndPoint_Types selfirst, bool doswap, bool selstatus);
@@ -138,7 +137,7 @@ void printknots(Object *obedit)
/* ********************* Shape keys *************** */ /* ********************* Shape keys *************** */
static CVKeyIndex *init_cvKeyIndex(void *cv, int key_index, int nu_index, int pt_index, int vertex_index, Nurb *orig_nu) static CVKeyIndex *init_cvKeyIndex(void *cv, int key_index, int nu_index, int pt_index, int vertex_index)
{ {
CVKeyIndex *cvIndex = MEM_callocN(sizeof(CVKeyIndex), "init_cvKeyIndex"); CVKeyIndex *cvIndex = MEM_callocN(sizeof(CVKeyIndex), "init_cvKeyIndex");
@@ -148,7 +147,6 @@ static CVKeyIndex *init_cvKeyIndex(void *cv, int key_index, int nu_index, int pt
cvIndex->pt_index = pt_index; cvIndex->pt_index = pt_index;
cvIndex->vertex_index = vertex_index; cvIndex->vertex_index = vertex_index;
cvIndex->switched = false; cvIndex->switched = false;
cvIndex->orig_nu = orig_nu;
return cvIndex; return cvIndex;
} }
@@ -174,7 +172,7 @@ static void init_editNurb_keyIndex(EditNurb *editnurb, ListBase *origBase)
origbezt = orignu->bezt; origbezt = orignu->bezt;
pt_index = 0; pt_index = 0;
while (a--) { while (a--) {
keyIndex = init_cvKeyIndex(origbezt, key_index, nu_index, pt_index, vertex_index, orignu); keyIndex = init_cvKeyIndex(origbezt, key_index, nu_index, pt_index, vertex_index);
BLI_ghash_insert(gh, bezt, keyIndex); BLI_ghash_insert(gh, bezt, keyIndex);
key_index += 12; key_index += 12;
vertex_index += 3; vertex_index += 3;
@@ -189,7 +187,7 @@ static void init_editNurb_keyIndex(EditNurb *editnurb, ListBase *origBase)
origbp = orignu->bp; origbp = orignu->bp;
pt_index = 0; pt_index = 0;
while (a--) { while (a--) {
keyIndex = init_cvKeyIndex(origbp, key_index, nu_index, pt_index, vertex_index, orignu); keyIndex = init_cvKeyIndex(origbp, key_index, nu_index, pt_index, vertex_index);
BLI_ghash_insert(gh, bp, keyIndex); BLI_ghash_insert(gh, bp, keyIndex);
key_index += 4; key_index += 4;
bp++; bp++;