blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v2.90-release'

This commit is contained in:
Clément Foucault 2020-08-05 22:29:40 +02:00
parent 2b7d39c3f1 59861db763
commit 3474b0968a
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/blenkernel/intern/material.c
View File

@ -1718,6 +1718,29 @@ static void material_default_volume_init(Material *ma)
nodeSetActive(ntree, output);
}
static void material_default_holdout_init(Material *ma)
{
bNodeTree *ntree = ntreeAddTree(NULL, "Shader Nodetree", ntreeType_Shader->idname);
ma->nodetree = ntree;
ma->use_nodes = true;
bNode *holdout = nodeAddStaticNode(NULL, ntree, SH_NODE_HOLDOUT);
bNode *output = nodeAddStaticNode(NULL, ntree, SH_NODE_OUTPUT_MATERIAL);
nodeAddLink(ntree,
holdout,
nodeFindSocket(holdout, SOCK_OUT, "Holdout"),
output,
nodeFindSocket(output, SOCK_IN, "Surface"));
holdout->locx = 10.0f;
holdout->locy = 300.0f;
output->locx = 300.0f;
output->locy = 300.0f;
nodeSetActive(ntree, output);
}
Material *BKE_material_default_empty(void)
{
return &default_material_empty;
@ -1763,6 +1786,7 @@ void BKE_materials_init(void)
material_default_surface_init(&default_material_surface);
material_default_volume_init(&default_material_volume);
material_default_holdout_init(&default_material_holdout);
material_default_gpencil_init(&default_material_gpencil);
}

2
source/blender/draw/engines/eevee/eevee_data.c
View File

@ -185,7 +185,7 @@ EEVEE_GeometryMotionData *EEVEE_motion_blur_hair_data_get(EEVEE_MotionBlurData *
key = DEG_get_original_object(ob)->data;
}
return motion_blur_geometry_data_get(mb, DEG_get_original_object(ob), true);
return motion_blur_geometry_data_get(mb, key, true);
}
/* View Layer data. */