[Bf-blender-cvs] [5f621a12c6d] master: Merge branch 'blender-v2.90-release'

[Bastien Montagne]

Commit: 5f621a12c6d14d6ec0439992bc0c2590a2bd4760
Author: Bastien Montagne
Date:   Tue Aug 4 13:36:58 2020 +0200
Branches: master
https://developer.blender.org/rB5f621a12c6d14d6ec0439992bc0c2590a2bd4760

Merge branch 'blender-v2.90-release'

Conflicts:
	source/blender/editors/gpencil/gpencil_primitive.c

===================================================================



===================================================================

diff --cc source/blender/editors/gpencil/gpencil_primitive.c
index 9006482d7bb,30be9bde7ae..35449ad4d34
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@@ -740,13 -741,13 +740,13 @@@ static void gpencil_primitive_update_st
    gpencil_session_validatebuffer(tgpi);
    gpencil_init_colors(tgpi);
    if (gset->flag & GP_SCULPT_SETT_FLAG_PRIMITIVE_CURVE) {
 -    BKE_curvemapping_initialize(ts->gp_sculpt.cur_primitive);
 +    BKE_curvemapping_init(ts->gp_sculpt.cur_primitive);
    }
    if (brush_settings->flag & GP_BRUSH_USE_JITTER_PRESSURE) {
 -    BKE_curvemapping_initialize(brush_settings->curve_jitter);
 +    BKE_curvemapping_init(brush_settings->curve_jitter);
    }
-   if (brush_settings->flag & GP_BRUSH_USE_STENGTH_PRESSURE) {
+   if (brush_settings->flag & GP_BRUSH_USE_STRENGTH_PRESSURE) {
 -    BKE_curvemapping_initialize(brush_settings->curve_strength);
 +    BKE_curvemapping_init(brush_settings->curve_strength);
    }
  
    /* get an array of depths, far depths are blended */