From 8a86ca97ebfcf186362b13ccfa2e9c027398fbe4 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 2 Mar 2020 11:00:00 +0100 Subject: [PATCH 1/3] makewheel: don't include libpythonX.Y.a in wheel Fixes #839 --- makepanda/makewheel.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py index 51948386b15..e69f8a3db84 100644 --- a/makepanda/makewheel.py +++ b/makepanda/makewheel.py @@ -732,7 +732,10 @@ def makewheel(version, output_dir, platform=None): pylib_path = os.path.join(libdir, pylib_arch, pylib_name) else: pylib_path = os.path.join(libdir, pylib_name) - whl.write_file('deploy_libs/' + pylib_name, pylib_path) + + # If Python was linked statically, we don't need to include this. + if not pylib_name.endswith('.a'): + whl.write_file('deploy_libs/' + pylib_name, pylib_path) whl.close() From e8d8f20acb5e51354762b41fd6397f32c1b74dcc Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 8 Mar 2020 10:30:04 +0100 Subject: [PATCH 2/3] collide: fix pusher convex angle detection for visible geometry Previously it was only working for CollisionPolygon. Fixes #879 --- panda/src/collide/collisionHandlerPusher.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/collide/collisionHandlerPusher.cxx b/panda/src/collide/collisionHandlerPusher.cxx index 5881b7e1775..fb7dc87c665 100644 --- a/panda/src/collide/collisionHandlerPusher.cxx +++ b/panda/src/collide/collisionHandlerPusher.cxx @@ -173,8 +173,8 @@ handle_entries() { const CollisionSolid *s2 = sd2._entry->get_into(); if (s1 != nullptr && s2 != nullptr && - s1->is_exact_type(CollisionPolygon::get_class_type()) && - s2->is_exact_type(CollisionPolygon::get_class_type()) && + s1->is_of_type(CollisionPolygon::get_class_type()) && + s2->is_of_type(CollisionPolygon::get_class_type()) && sd._entry->get_into_node_path() == sd2._entry->get_into_node_path()) { const CollisionPolygon *p1 = DCAST(CollisionPolygon, s1); From 17776b0666c4813b0a18bad2f4b3989ddb4347c3 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 8 Mar 2020 10:31:03 +0100 Subject: [PATCH 3/3] glgsg: fix shader not being applied if same across multiple buffers See https://discourse.panda3d.org/t/multi-pass-rendering-setinitialstate-wont-apply-shader/25712 --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 094df8ece44..040e71ea8d4 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -4148,6 +4148,7 @@ end_frame(Thread *current_thread) { _current_shader = nullptr; _current_shader_context = nullptr; } + _state_shader = nullptr; #endif // Respecify the active texture next frame, for good measure.