[Bf-blender-cvs] [3e2f938] depsgraph_refactor: Merge branch 'master' into depsgraph_refactor

[Sergey Sharybin]

Commit: 3e2f938a89bce35012f1f7ab622bb9119f0c4bd6
Author: Sergey Sharybin
Date:   Mon Feb 16 15:35:34 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB3e2f938a89bce35012f1f7ab622bb9119f0c4bd6

Merge branch 'master' into depsgraph_refactor

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



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

diff --cc source/blender/modifiers/intern/MOD_normal_edit.c
index 8860ae6,db20823..c2c1060
--- a/source/blender/modifiers/intern/MOD_normal_edit.c
+++ b/source/blender/modifiers/intern/MOD_normal_edit.c
@@@ -465,21 -477,9 +477,20 @@@ static void updateDepgraph(ModifierDat
  	}
  }
  
 +static void updateDepsgraph(ModifierData *md,
 +                            struct Scene *UNUSED(scene),
 +                            Object *UNUSED(ob),
 +                            struct DepsNodeHandle *node)
 +{
 +	NormalEditModifierData *smd = (NormalEditModifierData *) md;
 +	if (smd->target) {
 +		DEG_add_object_relation(node, smd->target, DEG_OB_COMP_GEOMETRY, "NormalEdit Modifier");
 +	}
 +}
 +
  static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm, ModifierApplyFlag UNUSED(flag))
  {
- 	normalEditModifier_do((NormalEditModifierData *)md, ob, dm);
- 	return dm;
+ 	return normalEditModifier_do((NormalEditModifierData *)md, ob, dm);
  }
  
  ModifierTypeInfo modifierType_NormalEdit = {