diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 20:26:16 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-10-20 20:26:16 +0300 |
| commit | d0989e538effc1c8b5e948224beaad25ab4bd569 (patch) | |
| tree | a4ee58fea6f190943cbb79d1985be66a779ae847 /source/gameengine/Ketsji | |
| parent | 418b24551e1b8a4458deceedca945a631f0684ac (diff) | |
| parent | 7830ec54186e8b05a366775e02c6457eb83814a3 (diff) | |
Merge commit '7830ec54186e8b05a366775e02c6457eb83814a3' into pbr-merge
Conflicts:
source/blender/nodes/shader/nodes/node_shader_texture.c
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Action.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/BL_Action.cpp b/source/gameengine/Ketsji/BL_Action.cpp index 45946f30827..7175eb877dd 100644 --- a/source/gameengine/Ketsji/BL_Action.cpp +++ b/source/gameengine/Ketsji/BL_Action.cpp @@ -161,7 +161,7 @@ bool BL_Action::Play(const char* name, BKE_libblock_free(G.main, m_tmpaction); m_tmpaction = NULL; } - m_tmpaction = BKE_action_copy(m_action); + m_tmpaction = BKE_action_copy(G.main, m_action); // First get rid of any old controllers ClearControllerList(); diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index c0d99d16a4c..b3061087344 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -1665,7 +1665,7 @@ static void update_anim_thread_func(TaskPool *pool, void *taskdata, int UNUSED(t // Only do deformers here if they are not parented to an armature, otherwise the armature will // handle updating its children - if (gameobj->GetDeformer() && (!parent || (parent && parent->GetGameObjectType() != SCA_IObject::OBJ_ARMATURE))) + if (gameobj->GetDeformer() && (!parent || parent->GetGameObjectType() != SCA_IObject::OBJ_ARMATURE)) gameobj->GetDeformer()->Update(); for (int j=0; j<children->GetCount(); ++j) { |