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>2017-11-09 17:40:07 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-09 17:45:21 +0300
commita6951df83615753143ba4e2b036ce5247e9d1e97 (patch)
treea5b8a2c4cf458c0ff717b01f9e1559af0baf4486 /source/blender/depsgraph
parent240b8b967994235b24a034c87c18218e923924b7 (diff)
Cleanup: Use full name for scene_layer in depsgraph
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc22
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
index 7bbab62e35b..c9cce520147 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
@@ -476,31 +476,31 @@ void update_copy_on_write_scene(const Depsgraph *depsgraph,
scene_cow->r.cfra = scene_orig->r.cfra;
scene_cow->r.subframe = scene_orig->r.subframe;
// Update bases.
- const SceneLayer *sl_orig = (SceneLayer *)scene_orig->render_layers.first;
- SceneLayer *sl_cow = (SceneLayer *)scene_cow->render_layers.first;
- while (sl_orig != NULL) {
+ const SceneLayer *scene_layer_orig = (SceneLayer *)scene_orig->render_layers.first;
+ SceneLayer *scene_layer_cow = (SceneLayer *)scene_cow->render_layers.first;
+ while (scene_layer_orig != NULL) {
// Update pointers to active base.
- if (sl_orig->basact == NULL) {
- sl_cow->basact = NULL;
+ if (scene_layer_orig->basact == NULL) {
+ scene_layer_cow->basact = NULL;
}
else {
- const Object *obact_orig = sl_orig->basact->object;
+ const Object *obact_orig = scene_layer_orig->basact->object;
Object *obact_cow = (Object *)depsgraph->get_cow_id(&obact_orig->id);
- sl_cow->basact = BKE_scene_layer_base_find(sl_cow, obact_cow);
+ scene_layer_cow->basact = BKE_scene_layer_base_find(scene_layer_cow, obact_cow);
}
// Update base flags.
//
// TODO(sergey): We should probably check visibled/selectabled
// flag here?
- const Base *base_orig = (Base *)sl_orig->object_bases.first;
- Base *base_cow = (Base *)sl_cow->object_bases.first;;
+ const Base *base_orig = (Base *)scene_layer_orig->object_bases.first;
+ Base *base_cow = (Base *)scene_layer_cow->object_bases.first;;
while (base_orig != NULL) {
base_cow->flag = base_orig->flag;
base_orig = base_orig->next;
base_cow = base_cow->next;
}
- sl_orig = sl_orig->next;
- sl_cow = sl_cow->next;
+ scene_layer_orig = scene_layer_orig->next;
+ scene_layer_cow = scene_layer_cow->next;
}
// Update edit object pointer.
if (scene_orig->obedit != NULL) {