mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
fixed color in baseline styles
This commit is contained in:
parent
e6d00d29ae
commit
c2c59d71bc
@ -2959,6 +2959,8 @@ class LevelStyleManager:
|
|||||||
self.createMiscAttribute('wall_height', [10, 20])
|
self.createMiscAttribute('wall_height', [10, 20])
|
||||||
# Window orientation menu
|
# Window orientation menu
|
||||||
self.createMiscAttribute('window_orientation', ['ur','ul',None,None])
|
self.createMiscAttribute('window_orientation', ['ur','ul',None,None])
|
||||||
|
# Sign orientation menu
|
||||||
|
self.createMiscAttribute('sign_orientation', ['ur','ul',None,None])
|
||||||
# Door orientation menu
|
# Door orientation menu
|
||||||
self.createMiscAttribute('door_orientation', ['ur','ul',None,None])
|
self.createMiscAttribute('door_orientation', ['ur','ul',None,None])
|
||||||
# Cornice orientation menu
|
# Cornice orientation menu
|
||||||
@ -4069,7 +4071,10 @@ class LevelEditorPanel(Pmw.MegaToplevel):
|
|||||||
self.addScaleZFloater.set(1)
|
self.addScaleZFloater.set(1)
|
||||||
self.addRollFloater.set(0)
|
self.addRollFloater.set(0)
|
||||||
|
|
||||||
self.updateSelectedObjColor(Vec4(1.0))
|
#self.updateSelectedObjColor(Vec4(1.0))
|
||||||
|
self.setCurrentColor(Vec4(1.0))
|
||||||
|
self.setResetColor(Vec4(1.0))
|
||||||
|
baseline.setColor(Vec4(1.0))
|
||||||
|
|
||||||
self.levelEditor.replaceSelectedEnabled=1
|
self.levelEditor.replaceSelectedEnabled=1
|
||||||
self.levelEditor.replaceSelected()
|
self.levelEditor.replaceSelected()
|
||||||
@ -4121,8 +4126,12 @@ class LevelEditorPanel(Pmw.MegaToplevel):
|
|||||||
if settings['roll']:
|
if settings['roll']:
|
||||||
self.addRollFloater.set(float(settings['roll']))
|
self.addRollFloater.set(float(settings['roll']))
|
||||||
|
|
||||||
if settings['color']:
|
color = settings['color']
|
||||||
self.updateSelectedObjColor(settings['color'])
|
if color:
|
||||||
|
#self.updateSelectedObjColor(settings['color'])
|
||||||
|
self.setCurrentColor(color)
|
||||||
|
self.setResetColor(color)
|
||||||
|
baseline.setColor(color)
|
||||||
|
|
||||||
self.levelEditor.replaceSelectedEnabled=1
|
self.levelEditor.replaceSelectedEnabled=1
|
||||||
self.levelEditor.replaceSelected()
|
self.levelEditor.replaceSelected()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user