TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2019-07-18 20:21:07 +02:00
commit 36e1b66349
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
direct/src/actor/Actor.py
View File

@ -67,7 +67,7 @@ class Actor(DirectObject, NodePath):
def __init__(self, filename = None, animBundle = None): def __init__(self, filename = None, animBundle = None):
self.filename = filename self.filename = filename
self.animBundle = None self.animBundle = animBundle
self.animControl = None self.animControl = None
def makeCopy(self): def makeCopy(self):
@ -1947,6 +1947,7 @@ class Actor(DirectObject, NodePath):
animName = acc.getAnimName(i) animName = acc.getAnimName(i)
animDef = Actor.AnimDef() animDef = Actor.AnimDef()
animDef.animBundle = animControl.getAnim()
animDef.animControl = animControl animDef.animControl = animControl
self.__animControlDict[lodName][partName][animName] = animDef self.__animControlDict[lodName][partName][animName] = animDef

2
panda/src/gobj/geom.h
View File

@ -85,7 +85,7 @@ PUBLISHED:
void offset_vertices(const GeomVertexData *data, int offset); void offset_vertices(const GeomVertexData *data, int offset);
int make_nonindexed(bool composite_only); 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; INLINE bool is_empty() const;