blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Depsgraph: Fix missing objects in viewport when CoW is enabled 

Remapping of pointers did not work properly, since it had no pointers yet to
remap base->object to a CoW object.
This commit is contained in:
Sergey Sharybin 2017-11-30 12:29:53 +01:00
parent 1c5c3748b5
commit c601ef7d7d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
View File

@ -65,13 +65,23 @@ extern "C" {
namespace DEG {
void DepsgraphNodeBuilder::build_view_layer(Scene *scene,
ViewLayer *view_layer,
eDepsNode_LinkedState_Type linked_state)
void DepsgraphNodeBuilder::build_view_layer(
Scene *scene,
ViewLayer *view_layer,
eDepsNode_LinkedState_Type linked_state)
{
/* Expand Scene Cow datablock to get proper pointers to bases. */
Scene *scene_cow;
ViewLayer *view_layer_cow;
if (DEG_depsgraph_use_copy_on_write()) {
/* NOTE: We need to create ID nodes for all objects coming from bases,
* otherwise remapping will not replace objects with their CoW versions
* for CoW bases.
*/
LINKLIST_FOREACH(Base *, base, &view_layer->object_bases) {
Object *object = base->object;
add_id_node(&object->id, false);
}
/* Make sure we've got ID node, so we can get pointer to CoW datablock.
*/
scene_cow = expand_cow_datablock(scene);