diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/depsgraph | |
parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r-- | source/blender/depsgraph/DEG_depsgraph.h | 4 | ||||
-rw-r--r-- | source/blender/depsgraph/util/deg_util_function.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index 2071342dfa0..1dd2e1e587a 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -42,9 +42,9 @@ * Evaluation Engine * ================= * - * The evaluation takes the operation-nodes the Depsgraph has tagged for updating, + * The evaluation takes the operation-nodes the Depsgraph has tagged for updating, * and schedules them up for being evaluated/executed such that the all dependency - * relationship constraints are satisfied. + * relationship constraints are satisfied. */ /* ************************************************* */ diff --git a/source/blender/depsgraph/util/deg_util_function.h b/source/blender/depsgraph/util/deg_util_function.h index 41669919c99..e91986d54ba 100644 --- a/source/blender/depsgraph/util/deg_util_function.h +++ b/source/blender/depsgraph/util/deg_util_function.h @@ -19,7 +19,7 @@ * All rights reserved. * * Original Author: Lukas Toenne - * Contributor(s): + * Contributor(s): * * ***** END GPL LICENSE BLOCK ***** */ |