Browse Source

Fixed particle panel

Josh Yelon 19 years ago
parent
commit
3abfe81f99
2 changed files with 3 additions and 4 deletions
  1. 1 1
      direct/src/directscripts/packpanda.nsi
  2. 2 3
      direct/src/tkpanels/ParticlePanel.py

+ 1 - 1
direct/src/directscripts/packpanda.nsi

@@ -146,7 +146,7 @@ Section "${SMDIRECTORY}" SecCore
 
             SetOutPath $INSTDIR
             WriteINIStr $INSTDIR\Website.url "InternetShortcut" "URL" "http://panda3d.etc.cmu.edu/"
-            WriteINIStr $INSTDIR\Manual.url "InternetShortcut" "URL" "http://panda3d.etc.cmu.edu/manual/"
+            WriteINIStr $INSTDIR\Manual.url "InternetShortcut" "URL" "http://panda3d.etc.cmu.edu/wiki/index.php"
             SetOutPath $INSTDIR\samples\GreetingCard
             CreateShortCut "$SMPROGRAMS\${SMDIRECTORY}\Panda Greeting Card.lnk" "$INSTDIR\bin\ppython.exe" 'GreetingCard.py "$SMPROGRAMS\${SMDIRECTORY}"' "$INSTDIR\bin\ppython.exe" 0 SW_SHOWMINIMIZED "" "Panda Greeting Card"
             SetOutPath $INSTDIR

+ 2 - 3
direct/src/tkpanels/ParticlePanel.py

@@ -5,17 +5,16 @@ from direct.tkwidgets.AppShell import *
 from direct.showbase.TkGlobal import *
 from tkFileDialog import *
 from tkSimpleDialog import askstring
-import os
 from direct.tkwidgets import Dial
 from direct.tkwidgets import Floater
 from direct.tkwidgets import Slider
 from direct.tkwidgets import VectorWidgets
-import Placer
 from direct.particles import ForceGroup
 from direct.particles import Particles
 from direct.particles import ParticleEffect
+import os,Placer
 
-from pandac.PandaModules import ColorBlendAttrib, getModelPath
+from pandac.PandaModules import *
 
 class ParticlePanel(AppShell):
     # Override class variables