diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-04 10:39:04 +0300 |
commit | 95011f6d484b369db92ae13c674a6522d664ea8f (patch) | |
tree | 91ba2719c9f3096fad0f1f768aa7b1c4d79aa32a /source/blender/editors/object/object_shapekey.c | |
parent | 0911acb5cf49c5ba05b1df045b41697704aa288a (diff) | |
parent | 44505b38df557a5711703613685a1dec9fc2c3d9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_shapekey.c')
-rw-r--r-- | source/blender/editors/object/object_shapekey.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index 1f80cb5f0bc..03fe6e9de65 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -35,7 +35,7 @@ #include <unistd.h> #else #include <io.h> -#endif +#endif #include "MEM_guardedalloc.h" @@ -119,7 +119,7 @@ static bool object_shape_key_mirror(bContext *C, Object *ob, key = BKE_key_from_object(ob); if (key == NULL) return 0; - + kb = BLI_findlink(&key->block, ob->shapenr - 1); if (kb) { @@ -211,7 +211,7 @@ static bool object_shape_key_mirror(bContext *C, Object *ob, MEM_freeN(tag_elem); } - + *r_totmirr = totmirr; *r_totfail = totfail; @@ -278,7 +278,7 @@ void OBJECT_OT_shape_key_add(wmOperatorType *ot) 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; @@ -321,7 +321,7 @@ void OBJECT_OT_shape_key_remove(wmOperatorType *ot) 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; @@ -341,13 +341,13 @@ static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op)) if (!key || !kb) return OPERATOR_CANCELLED; - + for (kb = key->block.first; kb; kb = kb->next) kb->curval = 0.0f; DEG_id_tag_update(&ob->id, OB_RECALC_DATA); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); - + return OPERATOR_FINISHED; } @@ -357,7 +357,7 @@ void OBJECT_OT_shape_key_clear(wmOperatorType *ot) 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; |