[Bf-blender-cvs] [f49b698] object_nodes: Merge branch 'master' into object_nodes

[Lukas Tönne]

Commit: f49b698e87d43553009c3a5ef19cd742511f1a7c
Author: Lukas Tönne
Date:   Wed May 11 11:16:48 2016 +0200
Branches: object_nodes
https://developer.blender.org/rBf49b698e87d43553009c3a5ef19cd742511f1a7c

Merge branch 'master' into object_nodes

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



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

diff --cc source/blender/makesdna/DNA_object_types.h
index 97f0dc3,d53c836..fca5494
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -282,6 -280,6 +282,7 @@@ typedef struct Object 
  	struct CurveCache *curve_cache;
  
  	struct DerivedMesh *derivedDeform, *derivedFinal;
++	int *pad3;
  	uint64_t lastDataMask;   /* the custom data layer mask that was last used to calculate derivedDeform and derivedFinal */
  	uint64_t customdata_mask; /* (extra) custom data layer mask to use for creating derivedmesh, set by depsgraph */
  	unsigned int state;			/* bit masks of game controllers that are active */
diff --cc source/blender/modifiers/intern/MOD_armature.c
index 967d229,2241a78..5ac95a5
--- a/source/blender/modifiers/intern/MOD_armature.c
+++ b/source/blender/modifiers/intern/MOD_armature.c
@@@ -123,7 -123,8 +123,8 @@@ static void updateDepsgraph(ModifierDat
  {
  	ArmatureModifierData *amd = (ArmatureModifierData *)md;
  	if (amd->object != NULL) {
 -		DEG_add_object_relation(node, amd->object, DEG_OB_COMP_EVAL_POSE, "Armature Modifier");
 -		DEG_add_object_relation(node, amd->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier");
 +		DEG_add_object_relation(node, amd->object, DEPSNODE_TYPE_EVAL_POSE, "Armature Modifier");
++		DEG_add_object_relation(node, amd->object, DEPSNODE_TYPE_TRANSFORM, "Armature Modifier");
  	}
  }
  
diff --cc source/blender/modifiers/intern/MOD_hook.c
index cf88713,bec0cc0..4ef34f1
--- a/source/blender/modifiers/intern/MOD_hook.c
+++ b/source/blender/modifiers/intern/MOD_hook.c
@@@ -145,14 -145,15 +145,15 @@@ static void updateDepsgraph(ModifierDat
  	HookModifierData *hmd = (HookModifierData *)md;
  	if (hmd->object != NULL) {
  		if (hmd->subtarget[0]) {
- 			/* TODO(sergey): Hpw do we add relation to bone here? */
- 			//DEG_add_object_relation(node, hmd->object, DEPSNODE_TYPE_EVAL_POSE, "Hook Modifier");
 -			DEG_add_bone_relation(node, hmd->object, hmd->subtarget, DEG_OB_COMP_TRANSFORM, "Hook Modifier");
 -			DEG_add_bone_relation(node, hmd->object, hmd->subtarget, DEG_OB_COMP_BONE, "Hook Modifier");
++			DEG_add_bone_relation(node, hmd->object, hmd->subtarget, DEPSNODE_TYPE_TRANSFORM, "Hook Modifier");
 +			DEG_add_bone_relation(node, hmd->object, hmd->subtarget, DEPSNODE_TYPE_BONE, "Hook Modifier");
  		}
  		else {
 -			DEG_add_object_relation(node, hmd->object, DEG_OB_COMP_TRANSFORM, "Hook Modifier");
 +			DEG_add_object_relation(node, hmd->object, DEPSNODE_TYPE_TRANSFORM, "Hook Modifier");
  		}
  	}
+ 	/* We need own transformation as well. */
 -	DEG_add_object_relation(node, ob, DEG_OB_COMP_TRANSFORM, "Hook Modifier");
++	DEG_add_object_relation(node, ob, DEPSNODE_TYPE_TRANSFORM, "Hook Modifier");
  }
  
  struct HookData_cb {