From 1b6caf23d0195501d525cf701f9748f3cc78102d Mon Sep 17 00:00:00 2001 From: Mark Mine Date: Tue, 4 May 2004 00:31:20 +0000 Subject: [PATCH] Use correct find, add otp, fix leveleditor bug --- direct/src/leveleditor/Configrc | 2 +- direct/src/leveleditor/LevelEditor.py | 4 ++-- direct/src/leveleditor/printdir | 11 +++++------ direct/src/leveleditor/printfiles | 1 + 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/direct/src/leveleditor/Configrc b/direct/src/leveleditor/Configrc index 4d947b9c74..4332e8bb5e 100644 --- a/direct/src/leveleditor/Configrc +++ b/direct/src/leveleditor/Configrc @@ -58,7 +58,7 @@ egg-object-type-dcs { 1 } # own bin and have them not fight with each other (or with other # transparent geometry). egg-object-type-shadow bin { shadow } 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 diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py index 9e6e164d4d..0ee6632a70 100644 --- a/direct/src/leveleditor/LevelEditor.py +++ b/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 diff --git a/direct/src/leveleditor/printdir b/direct/src/leveleditor/printdir index f6024ea6ef..afe19d2a1a 100755 --- a/direct/src/leveleditor/printdir +++ b/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 diff --git a/direct/src/leveleditor/printfiles b/direct/src/leveleditor/printfiles index 9690746e3c..75ac855a8b 100755 --- a/direct/src/leveleditor/printfiles +++ b/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