From 64c5cde2d2aee33acc43a8487401cc6dc44d9204 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 15 Oct 2015 10:33:58 -0700
Subject: [PATCH] further unmangle branch split

---
 interface/src/avatar/AvatarActionHold.cpp    | 4 ++++
 libraries/physics/src/ObjectActionSpring.cpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp
index 4288a354f5..3c57db084b 100644
--- a/interface/src/avatar/AvatarActionHold.cpp
+++ b/interface/src/avatar/AvatarActionHold.cpp
@@ -64,6 +64,10 @@ void AvatarActionHold::updateActionWorker(float deltaTimeStep) {
             _rotationalTarget = rotation;
             _positionalTargetSet = true;
             _rotationalTargetSet = true;
+            auto ownerEntity = _ownerEntity.lock();
+            if (ownerEntity) {
+                ownerEntity->setActionDataDirty(true);
+            }
         });
     }
     if (gotLock) {
diff --git a/libraries/physics/src/ObjectActionSpring.cpp b/libraries/physics/src/ObjectActionSpring.cpp
index 38b4b71d26..a99cfdd747 100644
--- a/libraries/physics/src/ObjectActionSpring.cpp
+++ b/libraries/physics/src/ObjectActionSpring.cpp
@@ -219,6 +219,7 @@ void ObjectActionSpring::deserialize(QByteArray serializedArguments) {
     uint16_t serializationVersion;
     dataStream >> serializationVersion;
     if (serializationVersion != ObjectActionSpring::springVersion) {
+        assert(false);
         return;
     }