Merge branch 'blender-v3.3-release'
This commit is contained in:
commit
09df97e897
|
@ -4989,10 +4989,12 @@ static void image_editors_update_frame(Image *ima,
|
|||
ImageUser *iuser,
|
||||
void *customdata)
|
||||
{
|
||||
int cfra = *(int *)customdata;
|
||||
if (ima && BKE_image_is_animated(ima)) {
|
||||
if ((iuser->flag & IMA_ANIM_ALWAYS) || (iuser->flag & IMA_NEED_FRAME_RECALC)) {
|
||||
int cfra = *(int *)customdata;
|
||||
|
||||
if ((iuser->flag & IMA_ANIM_ALWAYS) || (iuser->flag & IMA_NEED_FRAME_RECALC)) {
|
||||
BKE_image_user_frame_calc(ima, iuser, cfra);
|
||||
BKE_image_user_frame_calc(ima, iuser, cfra);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -578,14 +578,14 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
|
|||
/* Materials */
|
||||
for (Material *ma = bmain->materials.first; ma; ma = ma->id.next) {
|
||||
/* Update default material to be a bit more rough. */
|
||||
ma->roughness = 0.4f;
|
||||
ma->roughness = 0.5f;
|
||||
|
||||
if (ma->nodetree) {
|
||||
LISTBASE_FOREACH (bNode *, node, &ma->nodetree->nodes) {
|
||||
if (node->type == SH_NODE_BSDF_PRINCIPLED) {
|
||||
bNodeSocket *roughness_socket = nodeFindSocket(node, SOCK_IN, "Roughness");
|
||||
bNodeSocketValueFloat *roughness_data = roughness_socket->default_value;
|
||||
roughness_data->value = 0.4f;
|
||||
roughness_data->value = 0.5f;
|
||||
node->custom2 = SHD_SUBSURFACE_RANDOM_WALK;
|
||||
BKE_ntree_update_tag_node_property(ma->nodetree, node);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue