mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 10:54:24 -04:00
fix for crash due to previous checkin
This commit is contained in:
parent
84f25781b4
commit
d4e22c0795
@ -547,7 +547,8 @@ class FindContainers(Job):
|
|||||||
if hasLength or notDeadEnd:
|
if hasLength or notDeadEnd:
|
||||||
# prevent cycles in the references (i.e. base.loader.base)
|
# prevent cycles in the references (i.e. base.loader.base)
|
||||||
for goesThrough in parentObjRef.goesThroughGen(child):
|
for goesThrough in parentObjRef.goesThroughGen(child):
|
||||||
yield None
|
# don't yield, container might lose this element
|
||||||
|
pass
|
||||||
if not goesThrough:
|
if not goesThrough:
|
||||||
objRef = ObjectRef(Indirection(evalStr='.__dict__'),
|
objRef = ObjectRef(Indirection(evalStr='.__dict__'),
|
||||||
id(child), parentObjRef)
|
id(child), parentObjRef)
|
||||||
@ -585,7 +586,8 @@ class FindContainers(Job):
|
|||||||
if hasLength or notDeadEnd:
|
if hasLength or notDeadEnd:
|
||||||
# prevent cycles in the references (i.e. base.loader.base)
|
# prevent cycles in the references (i.e. base.loader.base)
|
||||||
for goesThrough in parentObjRef.goesThroughGen(curObj[key]):
|
for goesThrough in parentObjRef.goesThroughGen(curObj[key]):
|
||||||
yield None
|
# don't yield, container might lose this element
|
||||||
|
pass
|
||||||
if not goesThrough:
|
if not goesThrough:
|
||||||
if curObj is __builtin__.__dict__:
|
if curObj is __builtin__.__dict__:
|
||||||
objRef = ObjectRef(Indirection(evalStr='%s' % key),
|
objRef = ObjectRef(Indirection(evalStr='%s' % key),
|
||||||
@ -636,7 +638,8 @@ class FindContainers(Job):
|
|||||||
if hasLength or notDeadEnd:
|
if hasLength or notDeadEnd:
|
||||||
# prevent cycles in the references (i.e. base.loader.base)
|
# prevent cycles in the references (i.e. base.loader.base)
|
||||||
for goesThrough in parentObjRef.goesThrough(curObj[index]):
|
for goesThrough in parentObjRef.goesThrough(curObj[index]):
|
||||||
yield None
|
# don't yield, container might lose this element
|
||||||
|
pass
|
||||||
if not goesThrough:
|
if not goesThrough:
|
||||||
objRef = ObjectRef(Indirection(evalStr='[%s]' % index),
|
objRef = ObjectRef(Indirection(evalStr='[%s]' % index),
|
||||||
id(curObj[index]), parentObjRef)
|
id(curObj[index]), parentObjRef)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user