archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'blender-v2.93-release'

Browse Source
This commit is contained in:
Clément Foucault
2021-05-19 12:17:23 +02:00
parent 7adb415070 a294670bac
commit 81e3d904db
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
View File

@@ -194,6 +194,24 @@ static bool isDisabled(GpencilModifierData *md, int UNUSED(userRenderParams))
return isModifierDisabled(md); return isModifierDisabled(md);
} }
static void add_this_collection(Collection *c,
const ModifierUpdateDepsgraphContext *ctx,
const int mode)
{
FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN (c, ob, mode) {
if (ELEM(ob->type, OB_MESH, OB_MBALL, OB_CURVE, OB_SURF, OB_FONT)) {
if (ob->lineart.usage != OBJECT_LRT_EXCLUDE) {
DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_GEOMETRY, "Line Art Modifier");
DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
}
}
if (ob->type == OB_EMPTY && (ob->transflag & OB_DUPLICOLLECTION)) {
add_this_collection(ob->instance_collection, ctx, mode);
}
}
FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END;
}
static void updateDepsgraph(GpencilModifierData *md, static void updateDepsgraph(GpencilModifierData *md,
const ModifierUpdateDepsgraphContext *ctx, const ModifierUpdateDepsgraphContext *ctx,
const int mode) const int mode)
@@ -208,15 +226,7 @@ static void updateDepsgraph(GpencilModifierData *md,
ctx->node, lmd->source_object, DEG_OB_COMP_TRANSFORM, "Line Art Modifier"); ctx->node, lmd->source_object, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
} }
else { else {
FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN (ctx->scene->master_collection, ob, mode) { add_this_collection(ctx->scene->master_collection, ctx, mode);
if (ELEM(ob->type, OB_MESH, OB_MBALL, OB_CURVE, OB_SURF, OB_FONT)) {
if (ob->lineart.usage != OBJECT_LRT_EXCLUDE) {
DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_GEOMETRY, "Line Art Modifier");
DEG_add_object_relation(ctx->node, ob, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");
}
}
}
FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_END;
} }
DEG_add_object_relation( DEG_add_object_relation(
ctx->node, ctx->scene->camera, DEG_OB_COMP_TRANSFORM, "Line Art Modifier"); ctx->node, ctx->scene->camera, DEG_OB_COMP_TRANSFORM, "Line Art Modifier");

5
source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl
View File

@@ -37,8 +37,13 @@ void node_geometry(vec3 I,
normal = (toworld * vec4(N, 0.0)).xyz; normal = (toworld * vec4(N, 0.0)).xyz;
true_normal = normal; true_normal = normal;
# endif # endif
# ifdef HAIR_SHADER
tangent = -hairTangent;
# else
tangent_orco_z(orco, orco); tangent_orco_z(orco, orco);
node_tangent(N, orco, objmat, tangent); node_tangent(N, orco, objmat, tangent);
# endif
parametric = vec3(barycentric, 0.0); parametric = vec3(barycentric, 0.0);
backfacing = (gl_FrontFacing) ? 0.0 : 1.0; backfacing = (gl_FrontFacing) ? 0.0 : 1.0;