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:
authorCampbell Barton <ideasman42@gmail.com>2015-06-16 03:18:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-06-16 03:32:41 +0300
commitfa823dc828a3135d040f95a6977cdc516cabbe8e (patch)
tree4979691f8440ff20f8c1e1bb518a036e5dfd035e /source/blender/depsgraph
parentb1a92f2b3acf529cf86202a2b799fed64d89c3dd (diff)
Cleanup: style
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_build_relations.cc4
-rw-r--r--source/blender/depsgraph/intern/depsgraph_eval.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cc b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
index 20c059dbed6..41c8054c53a 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cc
@@ -426,9 +426,9 @@ void DepsgraphRelationBuilder::build_object(Main *bmain, Scene *scene, Object *o
break;
}
- Key *key =BKE_key_from_object(ob);
+ Key *key = BKE_key_from_object(ob);
if (key != NULL) {
- ComponentKey geometry_key((ID*)ob->data, DEPSNODE_TYPE_GEOMETRY);
+ ComponentKey geometry_key((ID *)ob->data, DEPSNODE_TYPE_GEOMETRY);
ComponentKey key_key(&key->id, DEPSNODE_TYPE_GEOMETRY);
add_relation(key_key, geometry_key, DEPSREL_TYPE_GEOMETRY_EVAL, "Shapekeys");
}
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 17096931e57..0a1563e7704 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -369,7 +369,7 @@ void DEG_evaluate_on_refresh(EvaluationContext *eval_ctx,
{
/* Update time on primary timesource. */
TimeSourceDepsNode *tsrc = graph->find_time_source();
- tsrc->cfra = BKE_scene_frame_get(scene);;
+ tsrc->cfra = BKE_scene_frame_get(scene);
DEG_evaluate_on_refresh_ex(eval_ctx, graph, graph->layers);
}