Merge branch 'release/1.10.x'

rdb · rdb · commit 515ce931b946 · 2020-03-08T10:37:05.000+01:00
diff --git a/makepanda/makewheel.py b/makepanda/makewheel.py
@@ -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()
 
diff --git 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);
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -4148,6 +4148,7 @@ end_frame(Thread *current_thread) {`
`4148`	`4148`	`_current_shader = nullptr;`
`4149`	`4149`	`_current_shader_context = nullptr;`
`4150`	`4150`	`}`
	`4151`	`+ _state_shader = nullptr;`
`4151`	`4152`	`#endif`
`4152`	`4153`
`4153`	`4154`	`// Respecify the active texture next frame, for good measure.`