Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/gpencil/gpencil_add_monkey.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_add_monkey.c')
-rw-r--r--source/blender/editors/gpencil/gpencil_add_monkey.c93
1 files changed, 62 insertions, 31 deletions
diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 8b4620d233b..f08188c48ce 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -66,17 +66,20 @@ static int gpencil_monkey_color(
ma = BKE_gpencil_object_material_new(bmain, ob, pct->name, &idx);
copy_v4_v4(ma->gp_style->stroke_rgba, pct->line);
+ srgb_to_linearrgb_v4(ma->gp_style->stroke_rgba, ma->gp_style->stroke_rgba);
+
copy_v4_v4(ma->gp_style->fill_rgba, pct->fill);
+ srgb_to_linearrgb_v4(ma->gp_style->fill_rgba, ma->gp_style->fill_rgba);
if (!stroke) {
- ma->gp_style->flag &= ~GP_STYLE_STROKE_SHOW;
+ ma->gp_style->flag &= ~GP_MATERIAL_STROKE_SHOW;
}
if (!fill) {
- ma->gp_style->flag &= ~GP_STYLE_FILL_SHOW;
+ ma->gp_style->flag &= ~GP_MATERIAL_FILL_SHOW;
}
else {
- ma->gp_style->flag |= GP_STYLE_FILL_SHOW;
+ ma->gp_style->flag |= GP_MATERIAL_FILL_SHOW;
}
return idx;
@@ -855,89 +858,117 @@ void ED_gpencil_create_monkey(bContext *C, Object *ob, float mat[4][4])
bGPDframe *frameLines = BKE_gpencil_frame_addnew(Lines, CFRA);
/* generate strokes */
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin, 270, 75);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin, 270, 75, false);
BKE_gpencil_stroke_add_points(gps, data0, 270, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Shadow, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Shadow, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data1, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Shadow, 18, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Shadow, 18, 60, false);
BKE_gpencil_stroke_add_points(gps, data2, 18, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Light, 64, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Light, 64, 60, false);
BKE_gpencil_stroke_add_points(gps, data3, 64, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Light, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Light, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data4, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Light, 64, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Light, 64, 60, false);
BKE_gpencil_stroke_add_points(gps, data5, 64, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Light, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Light, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data6, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Light, 18, 40);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Light, 18, 40, false);
BKE_gpencil_stroke_add_points(gps, data7, 18, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Eyes, 49, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Eyes, 49, 60, false);
BKE_gpencil_stroke_add_points(gps, data8, 49, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Shadow, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Shadow, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data9, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Eyes, 49, 60);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Eyes, 49, 60, false);
BKE_gpencil_stroke_add_points(gps, data10, 49, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Shadow, 18, 40);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Shadow, 18, 40, false);
BKE_gpencil_stroke_add_points(gps, data11, 18, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameFills, color_Skin_Shadow, 18, 40);
+ gps = BKE_gpencil_stroke_add(frameFills, color_Skin_Shadow, 18, 40, false);
BKE_gpencil_stroke_add_points(gps, data12, 18, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data13, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data14, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 65, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 65, 60, false);
BKE_gpencil_stroke_add_points(gps, data15, 65, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 34, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 34, 60, false);
BKE_gpencil_stroke_add_points(gps, data16, 34, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data17, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 33, 40);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 33, 40, false);
BKE_gpencil_stroke_add_points(gps, data18, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 34, 40);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 34, 40, false);
BKE_gpencil_stroke_add_points(gps, data19, 34, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data20, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 64, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 64, 60, false);
BKE_gpencil_stroke_add_points(gps, data21, 64, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Pupils, 26, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Pupils, 26, 60, false);
BKE_gpencil_stroke_add_points(gps, data22, 26, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Pupils, 26, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Pupils, 26, 60, false);
BKE_gpencil_stroke_add_points(gps, data23, 26, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data24, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 18, 40);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 18, 40, false);
BKE_gpencil_stroke_add_points(gps, data25, 18, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 18, 40);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 18, 40, false);
BKE_gpencil_stroke_add_points(gps, data26, 18, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
- gps = BKE_gpencil_add_stroke(frameLines, color_Black, 33, 60);
+ gps = BKE_gpencil_stroke_add(frameLines, color_Black, 33, 60, false);
BKE_gpencil_stroke_add_points(gps, data27, 33, mat);
+ BKE_gpencil_stroke_geometry_update(gps);
/* update depsgraph */
DEG_id_tag_update(&gpd->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 23:20:42 +0300