[Bf-blender-cvs] [cc05580] soc-2014-shapekey: Corrections to the last commit

[Grigory Revzin]

Commit: cc05580813d1a7958e2dca35d70fa72168c31dfe
Author: Grigory Revzin
Date:   Fri Jun 6 12:03:35 2014 +0400
https://developer.blender.org/rBcc05580813d1a7958e2dca35d70fa72168c31dfe

Corrections to the last commit

===================================================================

M	source/blender/blenkernel/intern/modifier.c

===================================================================

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 33a0910..b5cbec2 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -518,16 +518,12 @@ ModifierData *modifiers_getVirtualModifierList(Object *ob, VirtualModifierData *
 	}
 
 	/* shape key modifier, not yet for curves */
-<<<<<<< HEAD
-	if (ELEM(ob->type, OB_MESH, OB_LATTICE) && key) {
-=======
 	if (ELEM(ob->type, OB_MESH, OB_LATTICE) && BKE_key_from_object(ob)) {
 		if (ob->type == OB_MESH && (ob->shapeflag & OB_SHAPE_EDIT_MODE))
 			virtualModifierData->smd.modifier.mode |= eModifierMode_Editmode | eModifierMode_OnCage;
 		else
 			virtualModifierData->smd.modifier.mode &= ~eModifierMode_Editmode | eModifierMode_OnCage;
 
->>>>>>> parent of 4c02209... Moved Object->shapeflag to Key->pin
 		virtualModifierData->smd.modifier.next = md;
 		md = &virtualModifierData->smd.modifier;
 	}