TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 16:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2021-02-08 16:18:24 +01:00
commit cdad2c6e58
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
direct/src/interval/cInterval_ext.cxx
View File

@ -51,7 +51,10 @@ __await__(PyObject *self) {
return nullptr;
}
_this->start();
// This may be overridden from Python (such as is the case for Sequence), so
// we call this via Python.
PyObject *result = PyObject_CallMethod(self, "start", nullptr);
Py_XDECREF(result);
return Dtool_NewGenerator(self, &gen_next);
}

4
samples/roaming-ralph/main.py
View File

@ -268,7 +268,7 @@ class RoamingRalphDemo(ShowBase):
entries.sort(key=lambda x: x.getSurfacePoint(render).getZ())
for entry in entries:
if entry.getIntoNode().getName() == "terrain":
if entry.getIntoNode().name == "terrain":
self.ralph.setZ(entry.getSurfacePoint(render).getZ())
# Keep the camera at one unit above the terrain,
@ -278,7 +278,7 @@ class RoamingRalphDemo(ShowBase):
entries.sort(key=lambda x: x.getSurfacePoint(render).getZ())
for entry in entries:
if entry.getIntoNode().getName() == "terrain":
if entry.getIntoNode().name == "terrain":
self.camera.setZ(entry.getSurfacePoint(render).getZ() + 1.5)
if self.camera.getZ() < self.ralph.getZ() + 2.0:
self.camera.setZ(self.ralph.getZ() + 2.0)