diff options
Diffstat (limited to 'source/blender/editors/object/object_shapekey.c')
| -rw-r--r-- | source/blender/editors/object/object_shapekey.c | 652 |
1 files changed, 328 insertions, 324 deletions
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index d445177f236..aa0c6cbeef4 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -21,14 +21,13 @@ * \ingroup edobj */ - #include <math.h> #include <string.h> #ifndef WIN32 -#include <unistd.h> +# include <unistd.h> #else -#include <io.h> +# include <io.h> #endif #include "MEM_guardedalloc.h" @@ -54,7 +53,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "BLI_sys_types.h" // for intptr_t support +#include "BLI_sys_types.h" // for intptr_t support #include "ED_object.h" #include "ED_mesh.h" @@ -71,429 +70,434 @@ static void ED_object_shape_key_add(bContext *C, Object *ob, const bool from_mix) { - Main *bmain = CTX_data_main(C); - KeyBlock *kb; - if ((kb = BKE_object_shapekey_insert(bmain, ob, NULL, from_mix))) { - Key *key = BKE_key_from_object(ob); - /* for absolute shape keys, new keys may not be added last */ - ob->shapenr = BLI_findindex(&key->block, kb) + 1; - - WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - } + Main *bmain = CTX_data_main(C); + KeyBlock *kb; + if ((kb = BKE_object_shapekey_insert(bmain, ob, NULL, from_mix))) { + Key *key = BKE_key_from_object(ob); + /* for absolute shape keys, new keys may not be added last */ + ob->shapenr = BLI_findindex(&key->block, kb) + 1; + + WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); + } } /*********************** remove shape key ***********************/ static bool object_shapekey_remove(Main *bmain, Object *ob) { - KeyBlock *kb; - Key *key = BKE_key_from_object(ob); + KeyBlock *kb; + Key *key = BKE_key_from_object(ob); - if (key == NULL) { - return false; - } + if (key == NULL) { + return false; + } - kb = BLI_findlink(&key->block, ob->shapenr - 1); - if (kb) { - return BKE_object_shapekey_remove(bmain, ob, kb); - } + kb = BLI_findlink(&key->block, ob->shapenr - 1); + if (kb) { + return BKE_object_shapekey_remove(bmain, ob, kb); + } - return false; + return false; } -static bool object_shape_key_mirror(bContext *C, Object *ob, - int *r_totmirr, int *r_totfail, bool use_topology) +static bool object_shape_key_mirror( + bContext *C, Object *ob, int *r_totmirr, int *r_totfail, bool use_topology) { - KeyBlock *kb; - Key *key; - int totmirr = 0, totfail = 0; - - *r_totmirr = *r_totfail = 0; - - key = BKE_key_from_object(ob); - if (key == NULL) - return 0; - - kb = BLI_findlink(&key->block, ob->shapenr - 1); - - if (kb) { - char *tag_elem = MEM_callocN(sizeof(char) * kb->totelem, "shape_key_mirror"); - - - if (ob->type == OB_MESH) { - Mesh *me = ob->data; - MVert *mv; - int i1, i2; - float *fp1, *fp2; - float tvec[3]; - - ED_mesh_mirror_spatial_table(ob, NULL, NULL, NULL, 's'); - - for (i1 = 0, mv = me->mvert; i1 < me->totvert; i1++, mv++) { - i2 = mesh_get_x_mirror_vert(ob, NULL, i1, use_topology); - if (i2 == i1) { - fp1 = ((float *)kb->data) + i1 * 3; - fp1[0] = -fp1[0]; - tag_elem[i1] = 1; - totmirr++; - } - else if (i2 != -1) { - if (tag_elem[i1] == 0 && tag_elem[i2] == 0) { - fp1 = ((float *)kb->data) + i1 * 3; - fp2 = ((float *)kb->data) + i2 * 3; - - copy_v3_v3(tvec, fp1); - copy_v3_v3(fp1, fp2); - copy_v3_v3(fp2, tvec); - - /* flip x axis */ - fp1[0] = -fp1[0]; - fp2[0] = -fp2[0]; - totmirr++; - } - tag_elem[i1] = tag_elem[i2] = 1; - } - else { - totfail++; - } - } - - ED_mesh_mirror_spatial_table(ob, NULL, NULL, NULL, 'e'); - } - else if (ob->type == OB_LATTICE) { - Lattice *lt = ob->data; - int i1, i2; - float *fp1, *fp2; - int u, v, w; - /* half but found up odd value */ - const int pntsu_half = (lt->pntsu / 2) + (lt->pntsu % 2); - - /* currently editmode isn't supported by mesh so - * ignore here for now too */ - - /* if (lt->editlatt) lt = lt->editlatt->latt; */ - - for (w = 0; w < lt->pntsw; w++) { - for (v = 0; v < lt->pntsv; v++) { - for (u = 0; u < pntsu_half; u++) { - int u_inv = (lt->pntsu - 1) - u; - float tvec[3]; - if (u == u_inv) { - i1 = BKE_lattice_index_from_uvw(lt, u, v, w); - fp1 = ((float *)kb->data) + i1 * 3; - fp1[0] = -fp1[0]; - totmirr++; - } - else { - i1 = BKE_lattice_index_from_uvw(lt, u, v, w); - i2 = BKE_lattice_index_from_uvw(lt, u_inv, v, w); - - fp1 = ((float *)kb->data) + i1 * 3; - fp2 = ((float *)kb->data) + i2 * 3; - - copy_v3_v3(tvec, fp1); - copy_v3_v3(fp1, fp2); - copy_v3_v3(fp2, tvec); - fp1[0] = -fp1[0]; - fp2[0] = -fp2[0]; - totmirr++; - } - } - } - } - } - - MEM_freeN(tag_elem); - } - - *r_totmirr = totmirr; - *r_totfail = totfail; - - DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); - WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - - return 1; + KeyBlock *kb; + Key *key; + int totmirr = 0, totfail = 0; + + *r_totmirr = *r_totfail = 0; + + key = BKE_key_from_object(ob); + if (key == NULL) + return 0; + + kb = BLI_findlink(&key->block, ob->shapenr - 1); + + if (kb) { + char *tag_elem = MEM_callocN(sizeof(char) * kb->totelem, "shape_key_mirror"); + + if (ob->type == OB_MESH) { + Mesh *me = ob->data; + MVert *mv; + int i1, i2; + float *fp1, *fp2; + float tvec[3]; + + ED_mesh_mirror_spatial_table(ob, NULL, NULL, NULL, 's'); + + for (i1 = 0, mv = me->mvert; i1 < me->totvert; i1++, mv++) { + i2 = mesh_get_x_mirror_vert(ob, NULL, i1, use_topology); + if (i2 == i1) { + fp1 = ((float *)kb->data) + i1 * 3; + fp1[0] = -fp1[0]; + tag_elem[i1] = 1; + totmirr++; + } + else if (i2 != -1) { + if (tag_elem[i1] == 0 && tag_elem[i2] == 0) { + fp1 = ((float *)kb->data) + i1 * 3; + fp2 = ((float *)kb->data) + i2 * 3; + + copy_v3_v3(tvec, fp1); + copy_v3_v3(fp1, fp2); + copy_v3_v3(fp2, tvec); + + /* flip x axis */ + fp1[0] = -fp1[0]; + fp2[0] = -fp2[0]; + totmirr++; + } + tag_elem[i1] = tag_elem[i2] = 1; + } + else { + totfail++; + } + } + + ED_mesh_mirror_spatial_table(ob, NULL, NULL, NULL, 'e'); + } + else if (ob->type == OB_LATTICE) { + Lattice *lt = ob->data; + int i1, i2; + float *fp1, *fp2; + int u, v, w; + /* half but found up odd value */ + const int pntsu_half = (lt->pntsu / 2) + (lt->pntsu % 2); + + /* currently editmode isn't supported by mesh so + * ignore here for now too */ + + /* if (lt->editlatt) lt = lt->editlatt->latt; */ + + for (w = 0; w < lt->pntsw; w++) { + for (v = 0; v < lt->pntsv; v++) { + for (u = 0; u < pntsu_half; u++) { + int u_inv = (lt->pntsu - 1) - u; + float tvec[3]; + if (u == u_inv) { + i1 = BKE_lattice_index_from_uvw(lt, u, v, w); + fp1 = ((float *)kb->data) + i1 * 3; + fp1[0] = -fp1[0]; + totmirr++; + } + else { + i1 = BKE_lattice_index_from_uvw(lt, u, v, w); + i2 = BKE_lattice_index_from_uvw(lt, u_inv, v, w); + + fp1 = ((float *)kb->data) + i1 * 3; + fp2 = ((float *)kb->data) + i2 * 3; + + copy_v3_v3(tvec, fp1); + copy_v3_v3(fp1, fp2); + copy_v3_v3(fp2, tvec); + fp1[0] = -fp1[0]; + fp2[0] = -fp2[0]; + totmirr++; + } + } + } + } + } + + MEM_freeN(tag_elem); + } + + *r_totmirr = totmirr; + *r_totfail = totfail; + + DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); + WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); + + return 1; } /********************** shape key operators *********************/ static bool shape_key_mode_poll(bContext *C) { - Object *ob = ED_object_context(C); - ID *data = (ob) ? ob->data : NULL; - return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data) && ob->mode != OB_MODE_EDIT); + Object *ob = ED_object_context(C); + ID *data = (ob) ? ob->data : NULL; + return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data) && ob->mode != OB_MODE_EDIT); } static bool shape_key_mode_exists_poll(bContext *C) { - Object *ob = ED_object_context(C); - ID *data = (ob) ? ob->data : NULL; + Object *ob = ED_object_context(C); + ID *data = (ob) ? ob->data : NULL; - /* same as shape_key_mode_poll */ - return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data) && ob->mode != OB_MODE_EDIT) && - /* check a keyblock exists */ - (BKE_keyblock_from_object(ob) != NULL); + /* same as shape_key_mode_poll */ + return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data) && ob->mode != OB_MODE_EDIT) && + /* check a keyblock exists */ + (BKE_keyblock_from_object(ob) != NULL); } static bool shape_key_move_poll(bContext *C) { - /* Same as shape_key_mode_exists_poll above, but ensure we have at least two shapes! */ - Object *ob = ED_object_context(C); - ID *data = (ob) ? ob->data : NULL; - Key *key = BKE_key_from_object(ob); + /* Same as shape_key_mode_exists_poll above, but ensure we have at least two shapes! */ + Object *ob = ED_object_context(C); + ID *data = (ob) ? ob->data : NULL; + Key *key = BKE_key_from_object(ob); - return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data) && - ob->mode != OB_MODE_EDIT && key && key->totkey > 1); + return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data) && ob->mode != OB_MODE_EDIT && + key && key->totkey > 1); } static bool shape_key_poll(bContext *C) { - Object *ob = ED_object_context(C); - ID *data = (ob) ? ob->data : NULL; - return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data)); + Object *ob = ED_object_context(C); + ID *data = (ob) ? ob->data : NULL; + return (ob && !ID_IS_LINKED(ob) && data && !ID_IS_LINKED(data)); } static int shape_key_add_exec(bContext *C, wmOperator *op) { - Object *ob = ED_object_context(C); - const bool from_mix = RNA_boolean_get(op->ptr, "from_mix"); + Object *ob = ED_object_context(C); + const bool from_mix = RNA_boolean_get(op->ptr, "from_mix"); - ED_object_shape_key_add(C, ob, from_mix); + ED_object_shape_key_add(C, ob, from_mix); - DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); - DEG_relations_tag_update(CTX_data_main(C)); + DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); + DEG_relations_tag_update(CTX_data_main(C)); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } void OBJECT_OT_shape_key_add(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Add Shape Key"; - ot->idname = "OBJECT_OT_shape_key_add"; - ot->description = "Add shape key to the object"; - - /* api callbacks */ - ot->poll = shape_key_mode_poll; - ot->exec = shape_key_add_exec; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - - /* properties */ - RNA_def_boolean(ot->srna, "from_mix", true, "From Mix", "Create the new shape key from the existing mix of keys"); + /* identifiers */ + ot->name = "Add Shape Key"; + ot->idname = "OBJECT_OT_shape_key_add"; + ot->description = "Add shape key to the object"; + + /* api callbacks */ + ot->poll = shape_key_mode_poll; + ot->exec = shape_key_add_exec; + + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + + /* properties */ + RNA_def_boolean(ot->srna, + "from_mix", + true, + "From Mix", + "Create the new shape key from the existing mix of keys"); } static int shape_key_remove_exec(bContext *C, wmOperator *op) { - Main *bmain = CTX_data_main(C); - Object *ob = ED_object_context(C); - bool changed = false; - - if (RNA_boolean_get(op->ptr, "all")) { - changed = BKE_object_shapekey_free(bmain, ob); - } - else { - changed = object_shapekey_remove(bmain, ob); - } - - if (changed) { - DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); - DEG_relations_tag_update(CTX_data_main(C)); - WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - - return OPERATOR_FINISHED; - } - else { - return OPERATOR_CANCELLED; - } + Main *bmain = CTX_data_main(C); + Object *ob = ED_object_context(C); + bool changed = false; + + if (RNA_boolean_get(op->ptr, "all")) { + changed = BKE_object_shapekey_free(bmain, ob); + } + else { + changed = object_shapekey_remove(bmain, ob); + } + + if (changed) { + DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); + DEG_relations_tag_update(CTX_data_main(C)); + WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); + + return OPERATOR_FINISHED; + } + else { + return OPERATOR_CANCELLED; + } } void OBJECT_OT_shape_key_remove(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Remove Shape Key"; - ot->idname = "OBJECT_OT_shape_key_remove"; - ot->description = "Remove shape key from the object"; + /* identifiers */ + ot->name = "Remove Shape Key"; + ot->idname = "OBJECT_OT_shape_key_remove"; + ot->description = "Remove shape key from the object"; - /* api callbacks */ - ot->poll = shape_key_mode_exists_poll; - ot->exec = shape_key_remove_exec; + /* api callbacks */ + ot->poll = shape_key_mode_exists_poll; + ot->exec = shape_key_remove_exec; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - /* properties */ - RNA_def_boolean(ot->srna, "all", 0, "All", "Remove all shape keys"); + /* properties */ + RNA_def_boolean(ot->srna, "all", 0, "All", "Remove all shape keys"); } static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op)) { - Object *ob = ED_object_context(C); - Key *key = BKE_key_from_object(ob); - KeyBlock *kb = BKE_keyblock_from_object(ob); + Object *ob = ED_object_context(C); + Key *key = BKE_key_from_object(ob); + KeyBlock *kb = BKE_keyblock_from_object(ob); - if (!key || !kb) - return OPERATOR_CANCELLED; + if (!key || !kb) + return OPERATOR_CANCELLED; - for (kb = key->block.first; kb; kb = kb->next) - kb->curval = 0.0f; + for (kb = key->block.first; kb; kb = kb->next) + kb->curval = 0.0f; - DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); - WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); + DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); + WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } void OBJECT_OT_shape_key_clear(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Clear Shape Keys"; - ot->description = "Clear weights for all shape keys"; - ot->idname = "OBJECT_OT_shape_key_clear"; + /* identifiers */ + ot->name = "Clear Shape Keys"; + ot->description = "Clear weights for all shape keys"; + ot->idname = "OBJECT_OT_shape_key_clear"; - /* api callbacks */ - ot->poll = shape_key_poll; - ot->exec = shape_key_clear_exec; + /* api callbacks */ + ot->poll = shape_key_poll; + ot->exec = shape_key_clear_exec; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } /* starting point and step size could be optional */ static int shape_key_retime_exec(bContext *C, wmOperator *UNUSED(op)) { - Object *ob = ED_object_context(C); - Key *key = BKE_key_from_object(ob); - KeyBlock *kb = BKE_keyblock_from_object(ob); - float cfra = 0.0f; + Object *ob = ED_object_context(C); + Key *key = BKE_key_from_object(ob); + KeyBlock *kb = BKE_keyblock_from_object(ob); + float cfra = 0.0f; - if (!key || !kb) - return OPERATOR_CANCELLED; + if (!key || !kb) + return OPERATOR_CANCELLED; - for (kb = key->block.first; kb; kb = kb->next) { - kb->pos = cfra; - cfra += 0.1f; - } + for (kb = key->block.first; kb; kb = kb->next) { + kb->pos = cfra; + cfra += 0.1f; + } - DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); - WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); + DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); + WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } void OBJECT_OT_shape_key_retime(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Re-Time Shape Keys"; - ot->description = "Resets the timing for absolute shape keys"; - ot->idname = "OBJECT_OT_shape_key_retime"; + /* identifiers */ + ot->name = "Re-Time Shape Keys"; + ot->description = "Resets the timing for absolute shape keys"; + ot->idname = "OBJECT_OT_shape_key_retime"; - /* api callbacks */ - ot->poll = shape_key_poll; - ot->exec = shape_key_retime_exec; + /* api callbacks */ + ot->poll = shape_key_poll; + ot->exec = shape_key_retime_exec; - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; } static int shape_key_mirror_exec(bContext *C, wmOperator *op) { - Object *ob = ED_object_context(C); - int totmirr = 0, totfail = 0; - bool use_topology = RNA_boolean_get(op->ptr, "use_topology"); + Object *ob = ED_object_context(C); + int totmirr = 0, totfail = 0; + bool use_topology = RNA_boolean_get(op->ptr, "use_topology"); - if (!object_shape_key_mirror(C, ob, &totmirr, &totfail, use_topology)) - return OPERATOR_CANCELLED; + if (!object_shape_key_mirror(C, ob, &totmirr, &totfail, use_topology)) + return OPERATOR_CANCELLED; - ED_mesh_report_mirror(op, totmirr, totfail); + ED_mesh_report_mirror(op, totmirr, totfail); - return OPERATOR_FINISHED; + return OPERATOR_FINISHED; } void OBJECT_OT_shape_key_mirror(wmOperatorType *ot) { - /* identifiers */ - ot->name = "Mirror Shape Key"; - ot->idname = "OBJECT_OT_shape_key_mirror"; - ot->description = "Mirror the current shape key along the local X axis"; - - /* api callbacks */ - ot->poll = shape_key_mode_poll; - ot->exec = shape_key_mirror_exec; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - - /* properties */ - RNA_def_boolean(ot->srna, "use_topology", 0, "Topology Mirror", - "Use topology based mirroring (for when both sides of mesh have matching, unique topology)"); + /* identifiers */ + ot->name = "Mirror Shape Key"; + ot->idname = "OBJECT_OT_shape_key_mirror"; + ot->description = "Mirror the current shape key along the local X axis"; + + /* api callbacks */ + ot->poll = shape_key_mode_poll; + ot->exec = shape_key_mirror_exec; + + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + + /* properties */ + RNA_def_boolean( + ot->srna, + "use_topology", + 0, + "Topology Mirror", + "Use topology based mirroring (for when both sides of mesh have matching, unique topology)"); } - enum { - KB_MOVE_TOP = -2, - KB_MOVE_UP = -1, - KB_MOVE_DOWN = 1, - KB_MOVE_BOTTOM = 2, + KB_MOVE_TOP = -2, + KB_MOVE_UP = -1, + KB_MOVE_DOWN = 1, + KB_MOVE_BOTTOM = 2, }; static int shape_key_move_exec(bContext *C, wmOperator *op) { - Object *ob = ED_object_context(C); - - Key *key = BKE_key_from_object(ob); - const int type = RNA_enum_get(op->ptr, "type"); - const int totkey = key->totkey; - const int act_index = ob->shapenr - 1; - int new_index; - - switch (type) { - case KB_MOVE_TOP: - /* Replace the ref key only if we're at the top already (only for relative keys) */ - new_index = (ELEM(act_index, 0, 1) || key->type == KEY_NORMAL) ? 0 : 1; - break; - case KB_MOVE_BOTTOM: - new_index = totkey - 1; - break; - case KB_MOVE_UP: - case KB_MOVE_DOWN: - default: - new_index = (totkey + act_index + type) % totkey; - break; - } - - if (!BKE_keyblock_move(ob, act_index, new_index)) { - return OPERATOR_CANCELLED; - } - - DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); - WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - - return OPERATOR_FINISHED; + Object *ob = ED_object_context(C); + + Key *key = BKE_key_from_object(ob); + const int type = RNA_enum_get(op->ptr, "type"); + const int totkey = key->totkey; + const int act_index = ob->shapenr - 1; + int new_index; + + switch (type) { + case KB_MOVE_TOP: + /* Replace the ref key only if we're at the top already (only for relative keys) */ + new_index = (ELEM(act_index, 0, 1) || key->type == KEY_NORMAL) ? 0 : 1; + break; + case KB_MOVE_BOTTOM: + new_index = totkey - 1; + break; + case KB_MOVE_UP: + case KB_MOVE_DOWN: + default: + new_index = (totkey + act_index + type) % totkey; + break; + } + + if (!BKE_keyblock_move(ob, act_index, new_index)) { + return OPERATOR_CANCELLED; + } + + DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); + WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); + + return OPERATOR_FINISHED; } void OBJECT_OT_shape_key_move(wmOperatorType *ot) { - static const EnumPropertyItem slot_move[] = { - {KB_MOVE_TOP, "TOP", 0, "Top", "Top of the list"}, - {KB_MOVE_UP, "UP", 0, "Up", ""}, - {KB_MOVE_DOWN, "DOWN", 0, "Down", ""}, - {KB_MOVE_BOTTOM, "BOTTOM", 0, "Bottom", "Bottom of the list"}, - { 0, NULL, 0, NULL, NULL } - }; - - /* identifiers */ - ot->name = "Move Shape Key"; - ot->idname = "OBJECT_OT_shape_key_move"; - ot->description = "Move the active shape key up/down in the list"; - - /* api callbacks */ - ot->poll = shape_key_move_poll; - ot->exec = shape_key_move_exec; - - /* flags */ - ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; - - RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", ""); + static const EnumPropertyItem slot_move[] = { + {KB_MOVE_TOP, "TOP", 0, "Top", "Top of the list"}, + {KB_MOVE_UP, "UP", 0, "Up", ""}, + {KB_MOVE_DOWN, "DOWN", 0, "Down", ""}, + {KB_MOVE_BOTTOM, "BOTTOM", 0, "Bottom", "Bottom of the list"}, + {0, NULL, 0, NULL, NULL}}; + + /* identifiers */ + ot->name = "Move Shape Key"; + ot->idname = "OBJECT_OT_shape_key_move"; + ot->description = "Move the active shape key up/down in the list"; + + /* api callbacks */ + ot->poll = shape_key_move_poll; + ot->exec = shape_key_move_exec; + + /* flags */ + ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; + + RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", ""); } |