tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.1-release'

This commit is contained in:
Hans Goudey 2024-03-12 13:18:27 -04:00
parent 2ef441d87e 7d2d590f0e
commit 32bc206cc4
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/sculpt_paint/sculpt.cc
View File

@ -17,6 +17,7 @@
#include "CLG_log.h"
#include "BLI_array_utils.hh"
#include "BLI_bit_span_ops.hh"
#include "BLI_blenlib.h"
#include "BLI_dial_2d.h"
#include "BLI_ghash.h"
@ -1337,12 +1338,20 @@ static void paint_mesh_restore_node(Object *ob, const undo::Type type, PBVHNode
break;
}
case PBVH_GRIDS: {
PBVHVertexIter vd;
BKE_pbvh_vertex_iter_begin (ss->pbvh, node, vd, PBVH_ITER_UNIQUE) {
*CCG_elem_mask(&vd.key, vd.grid) = unode->mask[vd.i];
break;
SubdivCCG &subdiv_ccg = *ss->subdiv_ccg;
const BitGroupVector<> grid_hidden = subdiv_ccg.grid_hidden;
const CCGKey key = BKE_subdiv_ccg_key_top_level(subdiv_ccg);
const Span<CCGElem *> grids = subdiv_ccg.grids;
int index = 0;
for (const int grid : unode->grids) {
CCGElem *elem = grids[grid];
for (const int i : IndexRange(key.grid_area)) {
if (grid_hidden.is_empty() || !grid_hidden[grid][i]) {
*CCG_elem_offset_mask(&key, elem, i) = unode->mask[index];
}
index++;
}
}
BKE_pbvh_vertex_iter_end;
break;
}
}

8
source/blender/editors/util/ed_draw.cc
View File

@ -375,6 +375,10 @@ static void slider_update_factor(tSlider *slider, const wmEvent *event)
slider->factor = slider->raw_factor;
copy_v2fl_v2i(slider->last_cursor, event->xy);
if (slider->increments) {
slider->factor = round(slider->factor * 10) / 10;
}
if (!slider->overshoot) {
slider->factor = clamp_f(slider->factor, slider->factor_bounds[0], slider->factor_bounds[1]);
}
@ -386,10 +390,6 @@ static void slider_update_factor(tSlider *slider, const wmEvent *event)
slider->factor = min_ff(slider->factor, slider->factor_bounds[1]);
}
}
if (slider->increments) {
slider->factor = round(slider->factor * 10) / 10;
}
}
tSlider *ED_slider_create(bContext *C)