Browse Source

Use correct find, add otp, fix leveleditor bug

Mark Mine 21 years ago
parent
commit
1b6caf23d0

+ 1 - 1
direct/src/leveleditor/Configrc

@@ -58,7 +58,7 @@ egg-object-type-dcs             <DCS> { 1 }
 # own bin and have them not fight with each other (or with other
 # transparent geometry).
 egg-object-type-shadow          <Scalar> bin { shadow } <Scalar> alpha { blend-no-occlude }
-cull-bin shadow 25 unsorted
+cull-bin shadow 15 unsorted
 
 # The ID of the server that we are compatible with
 server-version sv1.0.14

+ 2 - 2
direct/src/leveleditor/LevelEditor.py

@@ -2124,7 +2124,7 @@ class LevelEditor(NodePath, PandaObject):
         for selectedNode in direct.selected:
             selectedNode.setHpr(self.getLastAngle(), 0, 0)
         # Snap objects to grid and update DNA if necessary
-        self.updateSelectedPose()
+        self.updateSelectedPose(direct.selected.getSelectedAsList())
         if direct.fShift:
             direct.grid.setSnapAngle(oldSnapAngle)
 
@@ -2175,7 +2175,7 @@ class LevelEditor(NodePath, PandaObject):
             selectedNode.setPos(direct.grid,
                                 selectedNode.getPos(direct.grid) + deltaPos)
         # Snap objects to grid and update DNA if necessary
-        self.updateSelectedPose()
+        self.updateSelectedPose(direct.selected.getSelectedAsList())
         # Restore grid spacing
         if direct.fShift:
             # Use back door to set grid spacing to avoid grid update

+ 5 - 6
direct/src/leveleditor/printdir

@@ -2,10 +2,9 @@
 
 # Some Cygwin users don't have find set on on their path correctly, so
 # we have to be explicit.
-PATH=/bin:$PATH
-export PATH
-
-find $1 -name "*$2" -print
-
-
+if [ -x /bin/find ]; then
+  /bin/find $1 -name \*$2 -print
+else
+  find $1 -name \*$2 -print
+fi
 

+ 1 - 0
direct/src/leveleditor/printfiles

@@ -59,6 +59,7 @@ echo $PANDA/lib/libpandadx8.dll
 echo $PANDA/lib/libpandagl.dll
 echo $PANDA/lib/libmiles_audio.dll
 echo $DIRECT/lib/libdirect.dll
+echo $OTP/lib/libotp.dll
 echo $TOONTOWN/lib/libtoontown.dll
 
 # Generated code for libpandaexpress