griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T55126: COW problem: there is an active object even if unselectable

Browse Source
This commit is contained in:
Sergey Sharybin
2018-06-07 16:30:19 +02:00
parent 819ad49d29
commit 86aaa3efba
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/layer.c
View File

@@ -1264,6 +1264,16 @@ void BKE_layer_eval_view_layer(
/* Store base in the array. */
view_layer->object_bases_array[base_index++] = base;
}
if (view_layer == DEG_get_evaluated_view_layer(depsgraph)) {
ViewLayer *view_layer_orig = DEG_get_input_view_layer(depsgraph);
Base *base_orig = view_layer_orig->object_bases.first;
const Base *base_eval = view_layer->object_bases.first;
while (base_orig != NULL) {
base_orig->flag = base_eval->flag;
base_orig = base_orig->next;
base_eval = base_eval->next;
}
}
}
void BKE_layer_eval_view_layer_indexed(

1
source/blender/blenkernel/intern/object_update.c
View File

@@ -145,6 +145,7 @@ void BKE_object_eval_done(Depsgraph *depsgraph, Object *ob)
Object *ob_orig = DEG_get_original_object(ob);
copy_m4_m4(ob_orig->obmat, ob->obmat);
ob_orig->transflag = ob->transflag;
ob_orig->flag = ob->flag;
}
}