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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Falk David
2024-11-12 18:56:59 +01:00
parent 091004f1b8 9a4ce4a0f7
commit 9dfcc506fc
4 changed files with 68 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
source/blender/editors/animation/anim_channels_edit.cc
View File

@@ -2064,34 +2064,39 @@ static void rearrange_grease_pencil_channels(bAnimContext *ac, eRearrangeAnimCha
ANIM_animdata_filter(
ac, &anim_data, eAnimFilter_Flags(filter), ac->data, eAnimCont_Types(ac->datatype));
LISTBASE_FOREACH (bAnimListElem *, ale, &anim_data) {
GreasePencil &grease_pencil = *reinterpret_cast<GreasePencil *>(ale->id);
Layer *layer = static_cast<Layer *>(ale->data);
if (mode == REARRANGE_ANIMCHAN_TOP) {
LISTBASE_FOREACH_BACKWARD (bAnimListElem *, ale, &anim_data) {
GreasePencil &grease_pencil = *reinterpret_cast<GreasePencil *>(ale->id);
Layer *layer = static_cast<Layer *>(ale->data);
if (layer->is_selected()) {
grease_pencil.move_node_top(layer->as_node());
}
}
}
else {
LISTBASE_FOREACH (bAnimListElem *, ale, &anim_data) {
GreasePencil &grease_pencil = *reinterpret_cast<GreasePencil *>(ale->id);
Layer *layer = static_cast<Layer *>(ale->data);
switch (mode) {
case REARRANGE_ANIMCHAN_TOP: {
if (layer->is_selected()) {
grease_pencil.move_node_top(layer->as_node());
switch (mode) {
case REARRANGE_ANIMCHAN_UP: {
if (layer->is_selected()) {
grease_pencil.move_node_up(layer->as_node());
}
break;
}
break;
}
case REARRANGE_ANIMCHAN_UP: {
if (layer->is_selected()) {
grease_pencil.move_node_up(layer->as_node());
case REARRANGE_ANIMCHAN_DOWN: {
if (layer->is_selected()) {
grease_pencil.move_node_down(layer->as_node());
}
break;
}
break;
}
case REARRANGE_ANIMCHAN_DOWN: {
if (layer->is_selected()) {
grease_pencil.move_node_down(layer->as_node());
case REARRANGE_ANIMCHAN_BOTTOM: {
if (layer->is_selected()) {
grease_pencil.move_node_bottom(layer->as_node());
}
break;
}
break;
}
case REARRANGE_ANIMCHAN_BOTTOM: {
if (layer->is_selected()) {
grease_pencil.move_node_bottom(layer->as_node());
}
break;
}
}
}

6
source/blender/editors/grease_pencil/intern/grease_pencil_lineart.cc
View File

@@ -66,10 +66,10 @@ void get_lineart_modifier_limits(const Object &ob,
void set_lineart_modifier_limits(GreasePencilLineartModifierData &lmd,
const blender::ed::greasepencil::LineartLimitInfo &info,
const bool is_first_lineart)
const bool cache_is_ready)
{
BLI_assert(lmd.modifier.type == eModifierType_GreasePencilLineart);
if (is_first_lineart || lmd.flags & MOD_LINEART_USE_CACHE) {
if ((!cache_is_ready) || (lmd.flags & MOD_LINEART_USE_CACHE)) {
lmd.level_start_override = info.min_level;
lmd.level_end_override = info.max_level;
lmd.edge_types_override = info.edge_types;
@@ -87,6 +87,8 @@ void set_lineart_modifier_limits(GreasePencilLineartModifierData &lmd,
GreasePencilLineartModifierData *get_first_lineart_modifier(const Object &ob)
{
/* This function always gets the first line art modifier regardless of their visibility, because
* cached line art configuration are always inside the first line art modifier. */
LISTBASE_FOREACH (ModifierData *, i_md, &ob.modifiers) {
if (i_md->type == eModifierType_GreasePencilLineart) {
return reinterpret_cast<GreasePencilLineartModifierData *>(i_md);

2
source/blender/editors/include/ED_grease_pencil.hh
View File

@@ -891,7 +891,7 @@ struct LineartLimitInfo {
void get_lineart_modifier_limits(const Object &ob, LineartLimitInfo &info);
void set_lineart_modifier_limits(GreasePencilLineartModifierData &lmd,
const LineartLimitInfo &info,
const bool is_first_lineart);
const bool cache_is_ready);
GreasePencilLineartModifierData *get_first_lineart_modifier(const Object &ob);

52
source/blender/modifiers/intern/MOD_lineart.cc
View File

@@ -55,7 +55,7 @@ static bool is_first_lineart(const GreasePencilLineartModifierData &md)
return true;
}
static bool is_last_line_art(const GreasePencilLineartModifierData &md)
static bool is_last_line_art(const GreasePencilLineartModifierData &md, const bool use_render)
{
if (md.modifier.type != eModifierType_GreasePencilLineart) {
return false;
@@ -63,7 +63,12 @@ static bool is_last_line_art(const GreasePencilLineartModifierData &md)
ModifierData *imd = md.modifier.next;
while (imd != nullptr) {
if (imd->type == eModifierType_GreasePencilLineart) {
return false;
if (use_render && (imd->mode & eModifierMode_Render)) {
return false;
}
if ((!use_render) && (imd->mode & eModifierMode_Realtime)) {
return false;
}
}
imd = imd->next;
}
@@ -767,7 +772,8 @@ static void panel_register(ARegionType *region_type)
static void generate_strokes(ModifierData &md,
const ModifierEvalContext &ctx,
GreasePencil &grease_pencil,
GreasePencilLineartModifierData &first_lineart)
GreasePencilLineartModifierData &first_lineart,
const bool force_compute)
{
using namespace bke::greasepencil;
auto &lmd = reinterpret_cast<GreasePencilLineartModifierData &>(md);
@@ -777,9 +783,16 @@ static void generate_strokes(ModifierData &md,
return;
}
LineartCache *local_lc = first_lineart.shared_cache;
const bool is_first_lineart = (&first_lineart == &lmd);
const bool use_cache = (lmd.flags & MOD_LINEART_USE_CACHE);
LineartCache *local_lc = (is_first_lineart || use_cache) ? first_lineart.shared_cache : nullptr;
if (!(lmd.flags & MOD_LINEART_USE_CACHE)) {
/* Only calculate strokes in these three conditions:
* 1. It's the very first line art modifier in the stack.
* 2. This line art modifier doesn't want to use globally cached data.
* 3. This modifier is not the first line art in stack, but it's the first that's visible (so we
* need to do a `force_compute`). */
if (is_first_lineart || (!use_cache) || force_compute) {
MOD_lineart_compute_feature_lines_v3(
ctx.depsgraph, lmd, &local_lc, !(ctx.object->dtx & OB_DRAW_IN_FRONT));
MOD_lineart_destroy_render_data_v3(&lmd);
@@ -825,11 +838,10 @@ static void generate_strokes(ModifierData &md,
lmd.flags,
lmd.calculation_flags);
if (!(lmd.flags & MOD_LINEART_USE_CACHE) && (&first_lineart != &lmd)) {
/* Clear local cache. */
if (local_lc != first_lineart.shared_cache) {
MOD_lineart_clear_cache(&local_lc);
}
if ((!is_first_lineart) && (!use_cache)) {
/* We only clear local cache, not global cache from the first line art modifier. */
BLI_assert(local_lc != first_lineart.shared_cache);
MOD_lineart_clear_cache(&local_lc);
/* Restore the original cache pointer so the modifiers below still have access to the "global"
* cache. */
lmd.cache = first_lineart.shared_cache;
@@ -850,18 +862,22 @@ static void modify_geometry_set(ModifierData *md,
blender::ed::greasepencil::get_first_lineart_modifier(*ctx->object);
BLI_assert(first_lineart);
bool is_first_lineart = (mmd == first_lineart);
if (is_first_lineart) {
mmd->shared_cache = MOD_lineart_init_cache();
ed::greasepencil::get_lineart_modifier_limits(*ctx->object, mmd->shared_cache->LimitInfo);
/* Since settings for line art cached data are always in the first line art modifier, we need to
* get and set overall calculation limits on the first modifier regardless of its visibility
* state. If line art cache doesn't exist, it means line art hasn't done any calculation. */
const bool cache_ready = (first_lineart->shared_cache != nullptr);
if (!cache_ready) {
first_lineart->shared_cache = MOD_lineart_init_cache();
ed::greasepencil::get_lineart_modifier_limits(*ctx->object,
first_lineart->shared_cache->LimitInfo);
}
ed::greasepencil::set_lineart_modifier_limits(
*mmd, first_lineart->shared_cache->LimitInfo, is_first_lineart);
*mmd, first_lineart->shared_cache->LimitInfo, cache_ready);
generate_strokes(*md, *ctx, grease_pencil, *first_lineart);
generate_strokes(*md, *ctx, grease_pencil, *first_lineart, (!cache_ready));
if (is_last_line_art(*mmd)) {
const bool use_render_params = (ctx->flag & MOD_APPLY_RENDER);
if (is_last_line_art(*mmd, use_render_params)) {
MOD_lineart_clear_cache(&first_lineart->shared_cache);
}