From 3abfe81f99f184c55733026d3d2b31c129c2c95a Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Fri, 14 Apr 2006 14:17:48 +0000 Subject: [PATCH] Fixed particle panel --- direct/src/directscripts/packpanda.nsi | 2 +- direct/src/tkpanels/ParticlePanel.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/direct/src/directscripts/packpanda.nsi b/direct/src/directscripts/packpanda.nsi index 4757ce015a..a86e654669 100755 --- a/direct/src/directscripts/packpanda.nsi +++ b/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 diff --git a/direct/src/tkpanels/ParticlePanel.py b/direct/src/tkpanels/ParticlePanel.py index 8af58991d7..d3b8a084e8 100644 --- a/direct/src/tkpanels/ParticlePanel.py +++ b/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