Skip to content
Permalink
Browse files

Merge branch 'release/1.10.x'

  • Loading branch information
rdb committed Mar 8, 2020
2 parents c9520c8 + 17776b0 commit 515ce931b94612a2e0cc4fbc461e98896f7c32cc
@@ -745,7 +745,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()

@@ -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);
@@ -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.

0 comments on commit 515ce93

Please sign in to comment.
You can’t perform that action at this time.