mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
don't keep internal editMgr attrib values in the spec -- avoid CVS merge conflicts
This commit is contained in:
parent
c9113efb32
commit
1b3acf63c1
@ -30,7 +30,14 @@ class EditMgrAI(EditMgrBase.EditMgrBase):
|
||||
data.update({'entId': id})
|
||||
self.level.setAttribChange(self.entId, 'insertEntity', data)
|
||||
|
||||
# clear out the attrib, it shouldn't be kept in the spec
|
||||
self.level.levelSpec.doSetAttrib(self.entId, 'requestNewEntity',
|
||||
None)
|
||||
|
||||
def getSpecSaveEvent(self):
|
||||
return 'requestSave-%s' % self.level.levelId
|
||||
def setRequestSave(self, data):
|
||||
messenger.send(self.getSpecSaveEvent())
|
||||
# clear out the attrib, it shouldn't be kept in the spec
|
||||
self.level.levelSpec.doSetAttrib(self.entId, 'requestSave',
|
||||
None)
|
||||
|
@ -22,7 +22,13 @@ class EditMgrBase(Entity.Entity):
|
||||
data['entType'],
|
||||
data['parentEntId'],
|
||||
)
|
||||
# clear out the attrib, it shouldn't be kept in the spec
|
||||
self.level.levelSpec.doSetAttrib(self.entId, 'insertEntity',
|
||||
None)
|
||||
|
||||
def setRemoveEntity(self, data):
|
||||
self.level.levelSpec.removeEntity(data['entId'],
|
||||
)
|
||||
# clear out the attrib, it shouldn't be kept in the spec
|
||||
self.level.levelSpec.doSetAttrib(self.entId, 'removeEntity',
|
||||
None)
|
||||
|
Loading…
x
Reference in New Issue
Block a user