diff options
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/brush.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 | ||||
| m--------- | source/tools | 0 |
5 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 67e43f9083b79b33f5aa6ac4d1630946804d953 +Subproject 7025cd28ede25eb44208722f842e35b10325c6c diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 0593db34e20..3f243d04965 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -2029,7 +2029,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]; @@ -2142,7 +2142,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]; diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index d2005473512..210cffcbcda 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -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; } diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index bfe967fcde5..1be27e0354c 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -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; diff --git a/source/tools b/source/tools -Subproject c1586ae29595713b597c22f6baa08d6cce42376 +Subproject 53b7c02a062c3d6ec6b38ce670836321b4e78fa |