1
1

Merge branch 'blender-v3.2-release'

This commit is contained in:
2022-05-15 00:36:42 -07:00
5 changed files with 7 additions and 6 deletions

View File

@@ -2030,7 +2030,7 @@ float BKE_brush_sample_tex_3d(const Scene *scene,
/* leave the coordinates relative to the screen */
/* use unadjusted size for tiled mode */
invradius = 1.0f / BKE_brush_size_get(scene, br);
invradius = 1.0f / ups->start_pixel_radius;
x = point_2d[0];
y = point_2d[1];
@@ -2143,7 +2143,7 @@ float BKE_brush_sample_masktex(
/* leave the coordinates relative to the screen */
/* use unadjusted size for tiled mode */
invradius = 1.0f / BKE_brush_size_get(scene, br);
invradius = 1.0f / ups->start_pixel_radius;
x = point_2d[0];
y = point_2d[1];

View File

@@ -923,6 +923,8 @@ PaintStroke *paint_stroke_new(bContext *C,
BKE_paint_set_overlay_override(br->overlay_flags);
ups->start_pixel_radius = BKE_brush_size_get(CTX_data_scene(C), br);
return stroke;
}

View File

@@ -1255,8 +1255,7 @@ typedef struct UnifiedPaintSettings {
* In case of anchored brushes contains the anchored radius */
float pixel_radius;
float initial_pixel_radius;
char _pad[4];
float start_pixel_radius;
/* drawing pressure */
float size_pressure_value;