Merge branch 'release/1.9.x'

direct/src/p3d/Packager.py

@@ -2196,8 +2196,10 @@ class Packager:
                     ext = Filename(lowerName).getExtension()
                     if ext not in self.packager.nonuniqueExtensions:
                         self.skipFilenames[lowerName] = True
+
                 for moduleName, mdef in package.moduleNames.items():
-                    self.skipModules[moduleName] = mdef
+                    if not mdef.exclude:
+                        self.skipModules[moduleName] = mdef
 
     # Packager constructor
     def __init__(self, platform = None):

dtool/src/interrogate/interfaceMakerPythonNative.cxx

@@ -2373,8 +2373,7 @@ write_module_class(ostream &out, Object *obj) {
           out << "  " << cClassName << " *local_this = NULL;\n";
           out << "  DTOOL_Call_ExtractThisPointerForType(self, &Dtool_" << ClassName << ", (void **) &local_this);\n";
           out << "  if (local_this == NULL) {\n";
-          out << "    PyErr_SetString(PyExc_AttributeError, \"C++ object is not yet constructed, or already destructed.\");\n";
-          out << "    return -1;\n";
+          out << "    return 0;\n";
           out << "  }\n\n";
 
           // Find the remap.  There should be only one.

dtool/src/prc/configDeclaration.cxx

@@ -163,9 +163,9 @@ output(ostream &out) const {
 void ConfigDeclaration::
 write(ostream &out) const {
   out << get_variable()->get_name() << " " << get_string_value();
-  if (!get_variable()->is_used()) {
-    out << "  (not used)";
-  }
+  //if (!get_variable()->is_used()) {
+  //  out << "  (not used)";
+  //}
   out << "\n";
 }
 

samples/media-player/main.py

@@ -38,7 +38,8 @@ class MediaPlayer(ShowBase):
         # but we want to make sure we get a MovieTexture, since it
         # implements synchronizeTo.
         self.tex = MovieTexture("name")
-        assert self.tex.read(media_file), "Failed to load video!"
+        success = self.tex.read(media_file)
+        assert success, "Failed to load video!"
 
         # Set up a fullscreen card to set the video texture on.
         cm = CardMaker("My Fullscreen Card")