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

Cleanup: Rename paint/brush variables

Browse Source 
Avoid one/two letter variable names.
This commit is contained in:
Hans Goudey
2024-06-10 08:49:59 -04:00
parent a0f8699d61
commit daefd4f838
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_paint.hh
View File

@@ -199,8 +199,8 @@ Paint *BKE_paint_get_active_from_context(const bContext *C);
PaintMode BKE_paintmode_get_active_from_context(const bContext *C);
PaintMode BKE_paintmode_get_from_tool(const bToolRef *tref);
Brush *BKE_paint_brush(Paint *paint);
const Brush *BKE_paint_brush_for_read(const Paint *p);
void BKE_paint_brush_set(Paint *paint, Brush *br);
const Brush *BKE_paint_brush_for_read(const Paint *paint);
void BKE_paint_brush_set(Paint *paint, Brush *brush);
Palette *BKE_paint_palette(Paint *paint);
void BKE_paint_palette_set(Paint *p, Palette *palette);
void BKE_paint_curve_clamp_endpoint_add_index(PaintCurve *pc, int add_index);

20
source/blender/blenkernel/intern/paint.cc
View File

@@ -663,24 +663,24 @@ PaintMode BKE_paintmode_get_from_tool(const bToolRef *tref)
return PaintMode::Invalid;
}
Brush *BKE_paint_brush(Paint *p)
Brush *BKE_paint_brush(Paint *paint)
{
return (Brush *)BKE_paint_brush_for_read((const Paint *)p);
return (Brush *)BKE_paint_brush_for_read((const Paint *)paint);
}
const Brush *BKE_paint_brush_for_read(const Paint *p)
const Brush *BKE_paint_brush_for_read(const Paint *paint)
{
return p ? p->brush : nullptr;
return paint ? paint->brush : nullptr;
}
void BKE_paint_brush_set(Paint *p, Brush *br)
void BKE_paint_brush_set(Paint *paint, Brush *brush)
{
if (p) {
id_us_min((ID *)p->brush);
id_us_plus((ID *)br);
p->brush = br;
if (paint) {
id_us_min((ID *)paint->brush);
id_us_plus((ID *)brush);
paint->brush = brush;
BKE_paint_toolslots_brush_update(p);
BKE_paint_toolslots_brush_update(paint);
}
}