blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Antonio Vazquez 2021-04-15 19:14:23 +02:00
parent 09eb04c0a8 fa8d566c3b
commit ec241eb0d0
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 1dbdb95ed93a8b96d12e42e17249f6e2cdd24619
Subproject commit 81815ea92c2071a08566dc66d4a871b6e2f5c868

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit 2ffe34eb02a81fb7023bd7dbfb8651865cb33921
Subproject commit 8970953d4a8a4ea3bf77c66370c817ed0cf1308a

2
source/blender/io/gpencil/intern/gpencil_io_base.cc
View File

@ -303,7 +303,7 @@ void GpencilIO::prepare_stroke_export_colors(Object *ob, bGPDstroke *gps)
/* Stroke color. */
copy_v4_v4(stroke_color_, gp_style->stroke_rgba);
avg_opacity_ = 0;
avg_opacity_ = 0.0f;
/* Get average vertex color and apply. */
float avg_color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
for (const bGPDspoint &pt : Span(gps->points, gps->totpoints)) {

5
source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
View File

@ -169,6 +169,7 @@ void GpencilExporterPDF::export_gpencil_layers()
continue;
}
/* Skip invisible lines. */
prepare_stroke_export_colors(ob, gps);
const float fill_opacity = fill_color_[3] * gpl->opacity;
const float stroke_opacity = stroke_color_[3] * stroke_average_opacity_get() *
gpl->opacity;
@ -179,7 +180,8 @@ void GpencilExporterPDF::export_gpencil_layers()
MaterialGPencilStyle *gp_style = BKE_gpencil_material_settings(ob, gps->mat_nr + 1);
const bool is_stroke = ((gp_style->flag & GP_MATERIAL_STROKE_SHOW) &&
(gp_style->stroke_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
(gp_style->stroke_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) &&
(stroke_opacity > GPENCIL_ALPHA_OPACITY_THRESH));
const bool is_fill = ((gp_style->flag & GP_MATERIAL_FILL_SHOW) &&
(gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH));
@ -189,7 +191,6 @@ void GpencilExporterPDF::export_gpencil_layers()
/* Duplicate the stroke to apply any layer thickness change. */
bGPDstroke *gps_duplicate = BKE_gpencil_stroke_duplicate(gps, true, false);
prepare_stroke_export_colors(ob, gps_duplicate);
/* Apply layer thickness change. */
gps_duplicate->thickness += gpl->line_change;

2
source/blender/makesrna/intern/rna_userdef.c
View File

@ -779,7 +779,7 @@ static const EnumPropertyItem *rna_userdef_audio_device_itemf(bContext *UNUSED(C
RNA_enum_item_add(&item, &totitem, &new_item);
}
# ifndef NDEBUG
# if !defined(NDEBUG) || !defined(WITH_AUDASPACE)
if (i == 0) {
EnumPropertyItem new_item = {i, "SOUND_NONE", 0, "No Sound", ""};
RNA_enum_item_add(&item, &totitem, &new_item);