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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-02-21 12:51:58 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-02-21 12:51:58 +0300
commitd4ee0cee51e01cf62acc1e239844fcb6c7dbf449 (patch)
treeeefa73fcc2fcf614707d409c4c8571f268afdeef /source/blender/blenkernel/intern/rigidbody.c
parentbfa51b1b0c705780bccbf551e81baa5846fd6a85 (diff)
parentfe1a508e551bc8309f552d69da0b74f7f5f5d46f (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/rigidbody.c')
-rw-r--r--source/blender/blenkernel/intern/rigidbody.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 4a52c4f7d14..011971b6677 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -1689,7 +1689,7 @@ void BKE_rigidbody_rebuild_sim(const struct EvaluationContext *eval_ctx,
{
float ctime = BKE_scene_frame_get(scene);
- if (G.debug & G_DEBUG_DEPSGRAPH) {
+ if (G.debug & G_DEBUG_DEPSGRAPH_EVAL) {
printf("%s at %f\n", __func__, ctime);
}
@@ -1704,7 +1704,7 @@ void BKE_rigidbody_eval_simulation(const struct EvaluationContext *eval_ctx,
{
float ctime = BKE_scene_frame_get(scene);
- if (G.debug & G_DEBUG_DEPSGRAPH) {
+ if (G.debug & G_DEBUG_DEPSGRAPH_EVAL) {
printf("%s at %f\n", __func__, ctime);
}
@@ -1721,7 +1721,7 @@ void BKE_rigidbody_object_sync_transforms(const struct EvaluationContext *UNUSED
RigidBodyWorld *rbw = scene->rigidbody_world;
float ctime = BKE_scene_frame_get(scene);
- if (G.debug & G_DEBUG_DEPSGRAPH) {
+ if (G.debug & G_DEBUG_DEPSGRAPH_EVAL) {
printf("%s on %s\n", __func__, ob->id.name);
}