diff --git a/krita/data/brushes/CMakeLists.txt b/krita/data/brushes/CMakeLists.txt index b42586a537..8524699336 100644 --- a/krita/data/brushes/CMakeLists.txt +++ b/krita/data/brushes/CMakeLists.txt @@ -1,171 +1,172 @@ install( FILES 3_brush.png 3_dotted-flat.png 3_eroded.gih 3_flat-brush.png 3_rake.png 3_splat.png 3_texture.png A_abstract-textured1.gbr A_abstract-textured2.gbr A_Angular_church.gbr A_Angular_church_HR.gbr A_bamboo.gih A_bamboo-leaves.gih A_bokey.gbr A_Braids_b.gbr A_Braids.gbr A_Chain.gbr A_cloudy.gbr A_concrete.gbr A_crackled.gbr A_craqules.gbr A_crayon.gbr A_dirty-brush.gih A_dirty-spot.gbr A_distant-mountain.gih A_dynamic-brush3.gih A_dynamic-brush.gih A_eroded-brush2.gih A_eroded-cercle_2.gbr A_eroded-cercle-anim.gih A_eroded-chinese-anim.gih A_eroded-dirtybrush-anim.gih A_eroded-knife-anim.gih A_fairy-dust.gih A_floor.gih A_flowers.gih A_forest.gih A_fur.gih A_grass-floor.gih A_herbs.gih A_leaves.gih A_leaves-mapple.gih A_lucky_star.gbr A_mineral-cristal.gih A_mountain-texture.gbr A_Nice_sketch2.gbr A_Nice_sketch.gbr A_pin.gih A_provencal.gbr A_Rake.gbr A_random-vegetal2.gih A_random-vegetal3.gbr A_random-vegetal.gih A_reptile-skin.gbr A_rocks-floor-neg.gih A_rocks.gih A_smoke.gbr A_snow-pack.gih A_sparkle1.gbr A_sparkle2.gbr A_sparkle3.gbr A_splat1.gbr A_splat2.gih A_starfield2.gbr A_starfield.gih A_wall-texture.gih C_Cloud_1.gbr C_Dirty_Spot.gbr D_Dust_1.gbr D_Dust_Particles.gih D_Normal_dust.gbr F_Furr_fast.gbr Flat_textured1.gih Flat_textured2.gih G_Sparks.gih L_Coroballs.gbr L_Foliage_1.gbr LJF_Foliage_Brush_01.gbr LJF_Foliage_Brush_02.gbr LJF_smoke_c.gih LJF_Water_Brush_02.gih LJF_Water_Brush_03.gih L_Leaf_2.gbr L_Leaf_3.gbr L_Trees.gih M_01.gbr M_02.gbr M_03.gbr M_04.gbr M_05.gbr M_06.gbr M_07.gbr M_08.gbr M_09.gbr M_Arrow.gbr M_Bulb.gbr M_Cage.gbr M_Pipe_1.gbr M_Pipe_2.gbr M_Pipe_3.gbr M_Pipe_whiteflat.png MZ_leaves.gbr N_Grass_1.gih N_Grass_2.gih O_Oils_1.gbr O_Oils_1_GP.gbr O_Oil_Soft.gbr O_Oils_Softer.gbr oil_bristle.gbr +oil_knife.gbr P_2B_Pencil_Angled.gih P_6B_Pencil_Angled.gih P_Graphite_Black_Grass.gih P_Graphite_Pencil.gih P_Graphite_Pencil_grainb.gih P_Graphite_Pencil_grain.gih P_RealPencil10x10.gih P_RealPencil16x16.gih rake_textured_01.gbr rake_textured_02.gbr Real_oil_1.gbr Real_Oil_2.gbr R_Rake1.gbr R_Rake2.gbr R_Rake3.gbr R_Rake4.gbr R_Rake_small.gbr Rect_textured1.gih Rect_textured2.gih Rect_textured3.gih Sc_Scratches_2.gbr Sc_Scratches_3.gbr Sc_Scratches.gbr Sc_Scratch.gih S_Smudge_Cheese.gbr S_splats_02.gih Te_Techno_1.gih Te_Techno_Angular_Cross.gbr texture-a.png T_Fibers_1.gih T_Fibers_2.gih T_Texture_1.gbr T_Texture_2.gih T_Texture_3.gih T_Texture_4.gih T_Texture_5.gih T_Texture_6.gih T_Texture_7.gih U_Circle_circuit.gbr U_Circle_shape_1.gbr U_Circle_shape_2.gbr U_Circle_shape_3.gbr U_Circle_shape_4.gbr U_Circle_shape_5b.gbr U_Circle_shape_5c.gbr U_Circle_shape_5.gbr V_Vyle_Rock.gih Z_Chain_1.gbr Z_Pixel_1.gbr Z_Pixel__4_pix__45a.gbr Z_Pixel_4x4_rounded.gbr Z_Pixel_Cross.gbr z_study_pencil_2Hb.gih z_study_pencil_2H.gih z_study_pencil_2H_horiz.gih z_study_pencil_H.gih z_study_pencil_H_h.gih Z_Test-pressure.gih Z_Triangle_shape_1.gbr Z_Triangle_shape_2.gbr DESTINATION ${DATA_INSTALL_DIR}/krita/brushes) diff --git a/krita/data/brushes/oil_knife.gbr b/krita/data/brushes/oil_knife.gbr new file mode 100644 index 0000000000..a2cb048afa Binary files /dev/null and b/krita/data/brushes/oil_knife.gbr differ diff --git a/krita/data/paintoppresets/CMakeLists.txt b/krita/data/paintoppresets/CMakeLists.txt index 2b3c159844..c79086c760 100644 --- a/krita/data/paintoppresets/CMakeLists.txt +++ b/krita/data/paintoppresets/CMakeLists.txt @@ -1,138 +1,139 @@ install( FILES Airbrush_eraser.kpp Airbrush_linear.kpp Airbrush_linear_noisy.kpp Airbrush_pressure.kpp Basic_circle.kpp Basic_mix.kpp Basic_mix_soft.kpp Basic_tip_default.kpp Basic_tip_gaussian.kpp Basic_tip_soft.kpp Basic_wet.kpp Basic_wet_soft.kpp Blender_Blur.kpp Block_basic.kpp Block_bristles.kpp Block_fuzzy.kpp Block_mix_tilt.kpp Block_textured_1.kpp Block_textured_2.kpp Block_tilt.kpp Block_wet_tilt.kpp Bristle_frottis.kpp Bristles_hairy.kpp Bristles_mix.kpp Bristles_textured.kpp Bristles_wet.kpp Brush_dotted.kpp Brush_textured.kpp Chalk_brush.kpp Clone_tool.kpp Curve_curvy.kpp Curve_ink.kpp Curve_recurvy.kpp Curve_smooth.kpp Eraser_circle.kpp Eraser_hard.kpp Eraser_soft.kpp FX_blur_light.kpp FX_color_HSY.kpp FX_explode.kpp FX_glow_add.kpp FX_overlay.kpp FX_splat_starfield.kpp Fill_block.kpp Fill_circle.kpp Grid_square_25.kpp Bristle_Details.kpp Bristle_Large.kpp Bristle_Special_Blender.kpp Bristle_Squared.kpp Bristle_Tapered.kpp Bristle_Texture.kpp Hatch_crispy.kpp Hatch_cross_regular.kpp Hatch_cross_small.kpp Hatch_diag_S.kpp Hatch_diag_fat.kpp Hatch_moire.kpp Hatch_noisy.kpp Ink_ballpen.kpp Ink_brush_25.kpp Ink_circle_05.kpp Ink_circle_10.kpp Ink_gpen_10.kpp Ink_gpen_25.kpp Ink_tilt_10.kpp Ink_tilt_20.kpp Layout_block.kpp Layout_circle_soft.kpp Layout_oval.kpp Layout_pen.kpp Move_tool.kpp Oils_bristle.kpp +Oils_knife.kpp Pastel_texture_large.kpp Pastel_texture_thin.kpp Pencil_2B.kpp Pencil_HB.kpp Pencil_texture.kpp Pencil_tilt.kpp Quick_circle_big.kpp Quick_circle_huge.kpp Quick_circle_layout.kpp Rake_bristle_dry.kpp Rake_texture.kpp Screentones.kpp Screentones_eraser.kpp Shape_fill.kpp Shape_smooth.kpp Sketch.kpp Sketch_chrome.kpp Sketch_fur.kpp Sketch_ink_big.kpp Sketch_ink_small.kpp Sketch_line.kpp Sketch_shade.kpp Sketch_shade_wash.kpp Sketch_speedpaint.kpp Sketch_speedpaint_shade.kpp Sketch_wires.kpp Smudge_block_tilt.kpp Smudge_rake.kpp Smudge_rake_2.kpp Smudge_soft.kpp Smudge_textured.kpp Smudge_water.kpp Sparkle_wet.kpp Sparkle_wet_soft.kpp Special_dyna_dots.kpp Special_FuzzyColor.kpp Special_particles_crazy.kpp Splat_mix_cells.kpp Splat_texture.kpp Splat_texture_2.kpp Splat_wet_cells.kpp Splatter_thin.kpp Sponge_texture.kpp Spray_splat.kpp Tangent_normal_basic.kpp Tangent_normal_drawing_angle.kpp Tangent_normal_hairy.kpp Tangent_normal_pixel.kpp Tangent_normal_y_inverted.kpp Texture_fuzzy.kpp Texture_hair.kpp Texture_leaves_fuzzy.kpp Textured_tilt.kpp ink_precision_03.kpp pixel1.kpp Pixelart_dither.kpp Pixelart_round.kpp Pixelart_square.kpp DESTINATION ${DATA_INSTALL_DIR}/krita/paintoppresets) install( FILES kis_paintoppresets_tags.xml DESTINATION ${DATA_INSTALL_DIR}/krita/tags) diff --git a/krita/data/paintoppresets/Oils_knife.kpp b/krita/data/paintoppresets/Oils_knife.kpp new file mode 100644 index 0000000000..30214c3f59 Binary files /dev/null and b/krita/data/paintoppresets/Oils_knife.kpp differ