diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-12 15:50:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-12 15:50:43 +0400 |
| commit | 405c9d9a95d2298813fbc44c2a119c195931cebe (patch) | |
| tree | 1be0da28e43553bf82a332a207ccff5e4acc5f0a /source/blender/editors | |
| parent | 7db13b989a2ca49252eeaffeb1cfc9fe61bb03e5 (diff) | |
code cleanup: remove unused KeyBlock.adrcode
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/object/object_shapekey.c | 24 |
2 files changed, 4 insertions, 23 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 37922b6e693..87640c9d419 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -247,7 +247,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) kbn = MEM_dupallocN(kb); kbn->prev = kbn->next = NULL; - /* adjust adrcode and other settings to fit (allocate a new data-array) */ + /* adjust settings to fit (allocate a new data-array) */ kbn->data = MEM_callocN(sizeof(float) * 3 * totvert, "joined_shapekey"); kbn->totelem = totvert; kbn->weights = NULL; @@ -260,7 +260,6 @@ int join_mesh_exec(bContext *C, wmOperator *op) kbn->pos = curpos; BLI_addtail(&key->block, kbn); - kbn->adrcode = key->totkey; key->totkey++; if (key->totkey == 1) key->refkey = kbn; diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index ba613db1740..79b1ca13c9e 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -130,28 +130,10 @@ static int ED_object_shape_key_remove(bContext *C, Object *ob) if (kb->data) MEM_freeN(kb->data); MEM_freeN(kb); - - for (kb= key->block.first; kb; kb= kb->next) - if (kb->adrcode>=ob->shapenr) - kb->adrcode--; - -#if 0 // XXX old animation system - if (key->ipo) { - - for (icu= key->ipo->curve.first; icu; icu= icu->next) { - if (icu->adrcode==ob->shapenr-1) { - BLI_remlink(&key->ipo->curve, icu); - free_ipo_curve(icu); - break; - } - } - for (icu= key->ipo->curve.first; icu; icu= icu->next) - if (icu->adrcode>=ob->shapenr) - icu->adrcode--; + + if (ob->shapenr > 1) { + ob->shapenr--; } -#endif // XXX old animation system - - if (ob->shapenr>1) ob->shapenr--; } if (key->totkey==0) { |