*** empty log message ***

direct/src/directtools/DirectCameraControl.py

@@ -20,8 +20,8 @@ class DirectCameraControl(PandaObject):
         self.coaMarker.setPos(0,100,0)
         useDirectRenderStyle(self.coaMarker)
         self.coaMarkerPos = Point3(0)
-        self.fLockCOA = 1
-        self.nullHitPtCount = 0
+        self.fLockCOA = 0
+        self.nullHitPointCount = 0
         self.cqEntries = []
         self.coaMarkerRef = direct.group.attachNewNode('coaMarkerRef')
 	self.camManipRef = direct.group.attachNewNode('camManipRef')

direct/src/directtools/DirectSession.py

@@ -25,8 +25,8 @@ class DirectSession(PandaObject):
         __builtin__.direct = self
         # These come early since they are used later on
         self.group = render.attachNewNode('DIRECT')
-        self.font = loader.loadFont("models/fonts/Comic")
-        
+        # Set priority to 100 so it always is textured
+        self.font = loader.loadFont("models/fonts/Comic", 100)
         self.fEnabled = 0
         self.drList = DisplayRegionList()
         self.iRayList = map(lambda x: x.iRay, self.drList)
@@ -304,7 +304,6 @@ class DirectSession(PandaObject):
             self.selectedNPReadout.reparentTo(aspect2d)
             self.selectedNPReadout.setText(
                 'Selected:' + dnp.name)
-            self.selectedNPReadout.adjustAllPriorities(100)
             # Show the manipulation widget
             self.widget.showWidget()
             # Update camera controls coa to this point
@@ -360,7 +359,6 @@ class DirectSession(PandaObject):
         self.activeParentReadout.reparentTo(aspect2d)
         self.activeParentReadout.setText(
             'Active Parent:' + nodePath.getName())
-        self.activeParentReadout.adjustAllPriorities(100)
         # Alert everyone else
         messenger.send('DIRECT_activeParent', [self.activeParent])
         
@@ -597,7 +595,6 @@ class DirectSession(PandaObject):
         taskMgr.removeTasksNamed('hideDirectMessageLater')
         self.directMessageReadout.reparentTo(aspect2d)
         self.directMessageReadout.setText(text)
-        self.directMessageReadout.adjustAllPriorities(100)
         self.hideDirectMessageLater()
 
     def hideDirectMessageLater(self):

direct/src/showbase/Loader.py

@@ -91,7 +91,7 @@ class Loader:
 	ModelPool.releaseModel(modelPath)
 
     # font loading funcs
-    def loadFont(self, modelPath):
+    def loadFont(self, modelPath, priority = 0):
         """loadFont(self, string)
 
         This loads a special model that will be sent to a TextNode as
@@ -104,12 +104,13 @@ class Loader:
         if phaseChecker:
             phaseChecker(modelPath)
         node = ModelPool.loadModel(modelPath)
-
-        #*** Temporary try-except to support old pandas without TextFont.
-        try:
-            font = TextFont(node)
-        except:
-            font = node
+        # Create a temp node path so you can adjust priorities
+        nodePath = hidden.attachNewNode(node)
+        nodePath.adjustAllPriorities(priority)
+        # Now create text font from the node
+        font = TextFont(node)
+        # And remove node path
+        nodePath.removeNode()
         return font
 
     # texture loading funcs