Merge branch 'release/1.10.x'

rdb · rdb · commit 26b86dfe5fbb · 2020-01-22T11:20:24.000+01:00
diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
@@ -2281,7 +2281,7 @@ def unloadAnims(self, anims=None, partName=None, lodName=None):
                             # our handle on them go. This is especially
                             # important if the anim control was blending
                             # animations.
-                            animDef.animControl.getPart().clearControlEffects()
+                            animDef.animControl.getPart().setControlEffect(animDef.animControl, 0.0)
                             animDef.animControl = None
 
 
diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py
@@ -2720,14 +2720,28 @@ def get_config_express():
     # otherwise, disable it.
     confautoprc = confautoprc.replace('#st#', '#')
 
-if PkgSkip("ASSIMP"):
+confautoprc = confautoprc.replace('\r\n', '\n')
+
+if PkgSkip("ASSIMP") or GetLinkAllStatic():
     confautoprc = confautoprc.replace("load-file-type p3assimp", "#load-file-type p3assimp")
 
+if PkgSkip("EGG") or GetLinkAllStatic():
+    confautoprc = confautoprc.replace("load-file-type egg pandaegg", "#load-file-type egg pandaegg")
+
+if PkgSkip("PANDATOOL") or PkgSkip("EGG") or GetLinkAllStatic():
+    confautoprc = confautoprc.replace("load-file-type p3ptloader", "#load-file-type p3ptloader")
+
+if PkgSkip("FFMPEG") or GetLinkAllStatic():
+    confautoprc = confautoprc.replace("load-audio-type * p3ffmpeg", "#load-audio-type * p3ffmpeg")
+    confautoprc = confautoprc.replace("load-video-type * p3ffmpeg", "#load-video-type * p3ffmpeg")
+
 if (os.path.isfile("makepanda/myconfig.in")):
     configprc = ReadFile("makepanda/myconfig.in")
 else:
     configprc = ReadFile("makepanda/config.in")
 
+configprc = configprc.replace('\r\n', '\n')
+
 if (GetTarget() == 'windows'):
     configprc = configprc.replace("$XDG_CACHE_HOME/panda3d", "$USER_APPDATA/Panda3D-%s" % MAJOR_VERSION)
 else:
@@ -2736,6 +2750,21 @@ def get_config_express():
 if (GetTarget() == 'darwin'):
     configprc = configprc.replace("$XDG_CACHE_HOME/panda3d", "$HOME/Library/Caches/Panda3D-%s" % MAJOR_VERSION)
 
+if PkgSkip("GL") or GetLinkAllStatic():
+    configprc = configprc.replace("\nload-display pandagl", "\n#load-display pandagl")
+
+if PkgSkip("GLES") or GetLinkAllStatic():
+    configprc = configprc.replace("\n#load-display pandagles", "")
+
+if PkgSkip("DX9") or GetLinkAllStatic():
+    configprc = configprc.replace("\n#load-display pandadx9", "")
+
+if PkgSkip("TINYDISPLAY") or GetLinkAllStatic():
+    configprc = configprc.replace("\n#load-display p3tinydisplay", "")
+
+if PkgSkip("OPENAL") or GetLinkAllStatic():
+    configprc = configprc.replace("audio-library-name p3openal_audio", "#audio-library-name p3openal_audio")
+
 if GetTarget() == 'windows':
     # Convert to Windows newlines.
     ConditionalWriteFile(GetOutputDir()+"/etc/Config.prc", configprc, newline='\r\n')
diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
@@ -1335,17 +1335,17 @@
 
   CGFloat hotspot_x = 0.0f;
   CGFloat hotspot_y = 0.0f;
-  if (image_props[@"hotspotX"] != nil) {
-    hotspot_x = [(NSNumber *)image_props[@"hotspotX"] floatValue];
+  if (NSNumber *number = image_props[@"hotspotX"]) {
+    hotspot_x = [number floatValue];
   }
-  if (image_props[@"hotspotY"] != nil) {
-    hotspot_y = [(NSNumber *)image_props[@"hotspotY"] floatValue];
+  if (NSNumber *number = image_props[@"hotspotY"]) {
+    hotspot_y = [number floatValue];
   }
   [image_props release];
 
   NSImage *image = [[NSImage alloc] initWithData:image_data];
 
-  NSCursor *cursor;
+  NSCursor *cursor = nil;
   if (image != nil) {
     // Apple recognizes that hotspots are usually specified from a .cur
     // file, whose origin is in the top-left, so there's no need to flip
