diff --git a/direct/src/interval/cInterval_ext.cxx b/direct/src/interval/cInterval_ext.cxx index 9604f8003b..1225bae004 100644 --- a/direct/src/interval/cInterval_ext.cxx +++ b/direct/src/interval/cInterval_ext.cxx @@ -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); } diff --git a/samples/roaming-ralph/main.py b/samples/roaming-ralph/main.py index 93ed173d5b..a762cc72a5 100755 --- a/samples/roaming-ralph/main.py +++ b/samples/roaming-ralph/main.py @@ -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)