blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v3.2-release'

This commit is contained in:
Joseph Eagar 2022-05-15 00:36:42 -07:00
parent 139a4b6a84 f9751889df
commit a46f34d9b3
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 67e43f9083b79b33f5aa6ac4d1630946804d9534
Subproject commit 7025cd28ede25eb44208722f842e35b10325c6cc

4
source/blender/blenkernel/intern/brush.c
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];

2
source/blender/editors/sculpt_paint/paint_stroke.c
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;
}

3
source/blender/makesdna/DNA_scene_types.h
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;

2
source/tools

@ -1 +1 @@
Subproject commit c1586ae29595713b597c22f6baa08d6cce423767
Subproject commit 53b7c02a062c3d6ec6b38ce670836321b4e78fab