Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-12 16:59:51 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-04-13 12:31:19 +0300
commitb92d78553b1889ff5bfbea17b35cf8fda586a062 (patch)
tree8800cd9fee6b6649d3c67921e160bb35e01610fa /intern/itasc/Scene.cpp
parent9599ed3ba7627054ce2e8543da90f86b8ff36c23 (diff)
Cleanup: don't use Blender structs in iTaSC module.
Diffstat (limited to 'intern/itasc/Scene.cpp')
-rw-r--r--intern/itasc/Scene.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/itasc/Scene.cpp b/intern/itasc/Scene.cpp
index 93f316783ba..5768a994970 100644
--- a/intern/itasc/Scene.cpp
+++ b/intern/itasc/Scene.cpp
@@ -257,7 +257,7 @@ bool Scene::getConstraintPose(ConstraintSet* constraint, void *_param, KDL::Fram
return true;
}
-bool Scene::update(const struct EvaluationContext *eval_ctx, double timestamp, double timestep, unsigned int numsubstep, bool reiterate, bool cache, bool interpolate)
+bool Scene::update(double timestamp, double timestep, unsigned int numsubstep, bool reiterate, bool cache, bool interpolate)
{
// we must have valid timestep and timestamp
if (timestamp < KDL::epsilon || timestep < 0.0)
@@ -316,7 +316,7 @@ bool Scene::update(const struct EvaluationContext *eval_ctx, double timestamp, d
}
}
if (os->object->getType()==Object::UnControlled && ((UncontrolledObject*)os->object)->getNrOfCoordinates() != 0) {
- ((UncontrolledObject*)(os->object))->updateCoordinates(eval_ctx, ts);
+ ((UncontrolledObject*)(os->object))->updateCoordinates(ts);
if (!ts.substep) {
// velocity of uncontrolled object remains constant during substepping
project(m_xdot,os->coordinaterange) = ((UncontrolledObject*)(os->object))->getXudot();