diff options
Diffstat (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c')
-rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c index 77616ae13b6..ec4cf71e00c 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c @@ -145,13 +145,12 @@ static void generateStrokes(GpencilModifierData *md, Depsgraph *depsgraph, Objec LineartCache *local_lc = gpd->runtime.lineart_cache; if (!gpd->runtime.lineart_cache) { MOD_lineart_compute_feature_lines( - depsgraph, lmd, &gpd->runtime.lineart_cache, (!(ob->dtx & OB_DRAW_IN_FRONT))); + depsgraph, lmd, &gpd->runtime.lineart_cache, !(ob->dtx & OB_DRAW_IN_FRONT)); MOD_lineart_destroy_render_data(lmd); } else { if (!(lmd->flags & LRT_GPENCIL_USE_CACHE)) { - MOD_lineart_compute_feature_lines( - depsgraph, lmd, &local_lc, (!(ob->dtx & OB_DRAW_IN_FRONT))); + MOD_lineart_compute_feature_lines(depsgraph, lmd, &local_lc, !(ob->dtx & OB_DRAW_IN_FRONT)); MOD_lineart_destroy_render_data(lmd); } MOD_lineart_chain_clear_picked_flag(local_lc); @@ -198,7 +197,7 @@ static void bakeModifier(Main *UNUSED(bmain), lmd->shadow_selection_override = lmd->shadow_selection; MOD_lineart_compute_feature_lines( - depsgraph, lmd, &gpd->runtime.lineart_cache, (!(ob->dtx & OB_DRAW_IN_FRONT))); + depsgraph, lmd, &gpd->runtime.lineart_cache, !(ob->dtx & OB_DRAW_IN_FRONT)); MOD_lineart_destroy_render_data(lmd); } @@ -373,19 +372,16 @@ static void edge_types_panel_draw(const bContext *UNUSED(C), Panel *panel) } sub = uiLayoutRow(col, false); - uiItemR(sub, ptr, "use_crease", 0, "", ICON_NONE); - entry = uiLayoutColumn(sub, false); - uiItemL(entry, IFACE_("Crease"), ICON_NONE); - uiLayoutSetActive(entry, RNA_boolean_get(ptr, "use_crease") || is_first); if (use_cache && !is_first) { - uiItemL(entry, IFACE_("Crease Angle Cached"), ICON_INFO); + uiItemR(sub, ptr, "use_crease", 0, IFACE_("Crease (Angle Cached)"), ICON_NONE); } else { - uiItemR(entry, + uiItemR(sub, ptr, "use_crease", 0, "", ICON_NONE); + uiItemR(sub, ptr, "crease_threshold", UI_ITEM_R_SLIDER | UI_ITEM_R_FORCE_BLANK_DECORATE, - IFACE_("Default Angle"), + NULL, ICON_NONE); } @@ -400,7 +396,12 @@ static void edge_types_panel_draw(const bContext *UNUSED(C), Panel *panel) sub = uiLayoutRow(entry, false); uiItemR(sub, ptr, "use_light_contour", 0, IFACE_("Light Contour"), ICON_NONE); - uiItemR(entry, ptr, "use_shadow", 0, IFACE_("Cast Shadow"), ICON_NONE); + uiItemR(entry, + ptr, + "use_shadow", + 0, + CTX_IFACE_(BLT_I18NCONTEXT_ID_GPENCIL, "Cast Shadow"), + ICON_NONE); uiItemL(layout, IFACE_("Options"), ICON_NONE); @@ -445,10 +446,8 @@ static void options_light_reference_draw(const bContext *UNUSED(C), Panel *panel uiItemR(remaining, ptr, "shadow_camera_size", 0, NULL, ICON_NONE); uiLayout *col = uiLayoutColumn(remaining, true); - uiItemR(col, ptr, "shadow_camera_near", 0, "Near", ICON_NONE); - uiItemR(col, ptr, "shadow_camera_far", 0, "Far", ICON_NONE); - - uiItemR(layout, ptr, "use_shadow_enclosed_shapes", 0, IFACE_("Enclosed Shapes"), ICON_NONE); + uiItemR(col, ptr, "shadow_camera_near", 0, IFACE_("Near"), ICON_NONE); + uiItemR(col, ptr, "shadow_camera_far", 0, IFACE_("Far"), ICON_NONE); } static void options_panel_draw(const bContext *UNUSED(C), Panel *panel) |