TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2016-09-14 20:57:26 +02:00
commit 08ea4bf2e5
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/ReleaseNotes
View File

@ -34,6 +34,8 @@ This issue fixes several bugs that were still found in 1.9.2.
* Support for InvSphere, Box and Tube solids in bam2egg * Support for InvSphere, Box and Tube solids in bam2egg
* Add normalized() method to vectors * Add normalized() method to vectors
* asyncFlattenStrong with inPlace=True caused node to disappear * asyncFlattenStrong with inPlace=True caused node to disappear
* Fix asyncFlattenStrong called on nodes without parent
* Fix is_playing() check when playing an animation backwards
------------------------ RELEASE 1.9.2 ------------------------ ------------------------ RELEASE 1.9.2 ------------------------

9
panda/src/pgraph/modelFlattenRequest.cxx
View File

@ -24,7 +24,16 @@ do_task() {
// We make another instance of the original node, so we can safely flatten // We make another instance of the original node, so we can safely flatten
// that without affecting the original copy. // that without affecting the original copy.
NodePath np("flatten_root"); NodePath np("flatten_root");
// Except if we try to attach a node without parents, this will cause the
// original NodePath to be affected, so we have to make a (shallow) copy.
if (_orig->get_num_parents() == 0) {
PT(PandaNode) copy = _orig->make_copy();
copy->copy_children(_orig);
np.attach_new_node(copy);
} else {
np.attach_new_node(_orig); np.attach_new_node(_orig);
}
np.flatten_strong(); np.flatten_strong();
_model = np.get_child(0).node(); _model = np.get_child(0).node();
_is_ready = true; _is_ready = true;

5
panda/src/putil/animInterface.cxx
View File

@ -356,7 +356,12 @@ is_playing() const {
return false; return false;
case PM_play: case PM_play:
if (_effective_frame_rate < 0.0) {
// If we're playing backwards, check if we're at the beginning.
return get_f() > 0;
} else {
return get_f() < _play_frames; return get_f() < _play_frames;
}
case PM_loop: case PM_loop:
case PM_pingpong: case PM_pingpong: