Merge branch 'master' into blender2.8

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;