Browse Source

Merge branch 'release/1.9.x'

rdb 9 years ago
parent
commit
14af38712b
3 changed files with 39 additions and 9 deletions
  1. 3 3
      README.md
  2. 12 6
      direct/src/stdpy/threading.py
  3. 24 0
      doc/ReleaseNotes

+ 3 - 3
README.md

@@ -31,8 +31,8 @@ are included as part of the Windows 7.1 SDK.
 You will also need to have the third-party dependency libraries available for
 You will also need to have the third-party dependency libraries available for
 the build scripts to use.  These are available from one of these two URLs,
 the build scripts to use.  These are available from one of these two URLs,
 depending on whether you are on a 32-bit or 64-bit system:
 depending on whether you are on a 32-bit or 64-bit system:
-https://www.panda3d.org/download/panda3d-1.9.1/panda3d-1.9.1-tools-win32.zip
-https://www.panda3d.org/download/panda3d-1.9.1/panda3d-1.9.1-tools-win64.zip
+https://www.panda3d.org/download/panda3d-1.9.2/panda3d-1.9.2-tools-win32.zip
+https://www.panda3d.org/download/panda3d-1.9.2/panda3d-1.9.2-tools-win64.zip
 
 
 After acquiring these dependencies, you may simply build Panda3D from the
 After acquiring these dependencies, you may simply build Panda3D from the
 command prompt using the following command:
 command prompt using the following command:
@@ -97,7 +97,7 @@ Mac OS X
 --------
 --------
 
 
 On Mac OS X, you will need to download a set of precompiled thirdparty packages in order to
 On Mac OS X, you will need to download a set of precompiled thirdparty packages in order to
-compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.9.1/panda3d-1.9.1-tools-mac.tar.gz).
+compile Panda3D, which can be acquired from [here](https://www.panda3d.org/download/panda3d-1.9.2/panda3d-1.9.2-tools-mac.tar.gz).
 
 
 After placing the thirdparty directory inside the panda3d source directory,
 After placing the thirdparty directory inside the panda3d source directory,
 you may build Panda3D using a command like the following:
 you may build Panda3D using a command like the following:

+ 12 - 6
direct/src/stdpy/threading.py

@@ -53,12 +53,6 @@ class ThreadBase:
     def getName(self):
     def getName(self):
         return self.name
         return self.name
 
 
-    def is_alive(self):
-        return self.__thread.isStarted()
-
-    def isAlive(self):
-        return self.__thread.isStarted()
-
     def isDaemon(self):
     def isDaemon(self):
         return self.daemon
         return self.daemon
 
 
@@ -114,6 +108,12 @@ class Thread(ThreadBase):
         if _thread and _thread._remove_thread_id:
         if _thread and _thread._remove_thread_id:
             _thread._remove_thread_id(self.ident)
             _thread._remove_thread_id(self.ident)
 
 
+    def is_alive(self):
+        return self.__thread.isStarted()
+
+    def isAlive(self):
+        return self.__thread.isStarted()
+
     def start(self):
     def start(self):
         if self.__thread.isStarted():
         if self.__thread.isStarted():
             raise RuntimeError
             raise RuntimeError
@@ -151,6 +151,12 @@ class ExternalThread(ThreadBase):
         self.__dict__['name'] = self.__thread.getName()
         self.__dict__['name'] = self.__thread.getName()
         self.__dict__['ident'] = threadId
         self.__dict__['ident'] = threadId
 
 
+    def is_alive(self):
+        return self.__thread.isStarted()
+
+    def isAlive(self):
+        return self.__thread.isStarted()
+
     def start(self):
     def start(self):
         raise RuntimeError
         raise RuntimeError
 
 

+ 24 - 0
doc/ReleaseNotes

@@ -1,3 +1,27 @@
+------------------------  RELEASE 1.9.2  ------------------------
+
+This is a minor bugfix release, fixing a few minor issues that
+remained in the 1.9.1 release, including:
+
+* Fix compile errors with more recent versions of ffmpeg
+* Include .lib files for pyd modules in Windows SDK
+* packp3d now recognizes default egg-object-type definitions
+* Fix issues with sphere-into-box and box-into-sphere collisions
+* Texture VRAM usage is now correctly reported by pstats
+* Support for reading BMP files with alpha channel
+* Fix OpenGL crashes in very ancient OpenGL versions
+* Fix rare compile issues and crashes with esoteric Python set-ups
+* Fix crash when extracting texture that's not a multiple of 4 bytes
+* Work around buggy NVIDIA driver that reports _main_* shader inputs
+* Add version of transform_vertices that accepts a SparseArray
+* Clamp shininess to 0 to avoid GL error when shininess < 0
+* Fix various bugs in RopeNode and NurbsCurveEvaluator
+* Fix clock-mode Config.prc settings
+* NodePath render_mode setters no longer reset wireframe color
+* Fix constant reloading of texture when gl-ignore-mipmaps is set
+* BamReader now releases the GIL (so it can be used threaded)
+* Fix AttributeError in direct.stdpy.threading module
+
 ------------------------  RELEASE 1.9.1  ------------------------
 ------------------------  RELEASE 1.9.1  ------------------------
 
 
 This minor release fixes some important regressions and bugs found
 This minor release fixes some important regressions and bugs found