From 9dd35f9c3a6e269148600958990317479d91cdd4 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 16 Jul 2019 13:40:14 +0200 Subject: [PATCH 1/2] gobj: default current_thread arg for Geom.get_animated_vertex_data() --- panda/src/gobj/geom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/gobj/geom.h b/panda/src/gobj/geom.h index 82aac75cfa..a1e0b960e4 100644 --- a/panda/src/gobj/geom.h +++ b/panda/src/gobj/geom.h @@ -85,7 +85,7 @@ PUBLISHED: void offset_vertices(const GeomVertexData *data, int offset); int make_nonindexed(bool composite_only); - CPT(GeomVertexData) get_animated_vertex_data(bool force, Thread *current_thread) const; + CPT(GeomVertexData) get_animated_vertex_data(bool force, Thread *current_thread = Thread::get_current_thread()) const; INLINE bool is_empty() const; From 22d50297a2ae34341b1523c0a03b5fc10f9e5317 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 18 Jul 2019 20:18:22 +0200 Subject: [PATCH 2/2] actor: fix makeSubpart on models with pre-bound animations Fixes #647 --- direct/src/actor/Actor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py index ff6dced979..902c6830d7 100644 --- a/direct/src/actor/Actor.py +++ b/direct/src/actor/Actor.py @@ -67,7 +67,7 @@ class Actor(DirectObject, NodePath): def __init__(self, filename = None, animBundle = None): self.filename = filename - self.animBundle = None + self.animBundle = animBundle self.animControl = None def makeCopy(self): @@ -1947,6 +1947,7 @@ class Actor(DirectObject, NodePath): animName = acc.getAnimName(i) animDef = Actor.AnimDef() + animDef.animBundle = animControl.getAnim() animDef.animControl = animControl self.__animControlDict[lodName][partName][animName] = animDef