griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: make format

Browse Source
This commit is contained in:
Martijn Versteegh
2023-07-05 19:42:52 +02:00
parent c4ddf16950
commit cd4848a574
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/curves/intern/curves_ops.cc
View File

@@ -893,7 +893,8 @@ static int select_random_exec(bContext *C, wmOperator *op)
const eAttrDomain selection_domain = eAttrDomain(curves_id->selection_domain);
IndexMaskMemory memory;
const IndexMask random_elements = random_mask(curves, selection_domain, seed, probability, memory);
const IndexMask random_elements = random_mask(
curves, selection_domain, seed, probability, memory);
const bool was_anything_selected = has_anything_selected(curves);
bke::GSpanAttributeWriter selection = ensure_selection_attribute(

17
source/blender/render/intern/texture_margin.cc
View File

@@ -124,21 +124,22 @@ class TextureMarginMap {
TextureMarginMap *m = static_cast<TextureMarginMap *>(map);
if (m->mask_) {
if (m->write_mask_) {
/* if there is a mask and write_mask_ is true, write to the mask */
/* if there is a mask and write_mask_ is true, write to the mask */
m->mask_[y * m->w_ + x] = 1;
m->set_pixel(x, y, m->value_to_store_);
} else {
/* if there is a mask and write_mask_ is false, read the mask
* to decide if the map needs to be written
*/
if (m->mask_[y*m->w_ + x] != 0 ) {
}
else {
/* if there is a mask and write_mask_ is false, read the mask
* to decide if the map needs to be written
*/
if (m->mask_[y * m->w_ + x] != 0) {
m->set_pixel(x, y, m->value_to_store_);
}
}
} else {
}
else {
m->set_pixel(x, y, m->value_to_store_);
}
}
/* The map contains 2 kinds of pixels: DijkstraPixels and polygon indices. The top bit determines