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

Fix: windows compile error

Browse Source 
Another ambiguous conversion for msvc introduced in baeb4d7753
This commit is contained in:
Aras Pranckevicius
2024-01-19 19:34:56 +02:00
parent 21407901f8
commit 0dc3ffb5af
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/modifiers/intern/MOD_grease_pencil_tint.cc
View File

@@ -181,7 +181,8 @@ static void modify_stroke_color(Object &ob,
auto get_material_color = [&](const int64_t curve_i) {
const Material *ma = BKE_object_material_get(&ob, stroke_materials[curve_i]);
const MaterialGPencilStyle *gp_style = ma ? ma->gp_style : nullptr;
return (gp_style ? gp_style->stroke_rgba : ColorGeometry4f(0.0f, 0.0f, 0.0f, 0.0f));
return (gp_style ? ColorGeometry4f(gp_style->stroke_rgba) :
ColorGeometry4f(0.0f, 0.0f, 0.0f, 0.0f));
};
auto get_point_factor = [&](const int64_t point_i) {
@@ -267,7 +268,8 @@ static void modify_fill_color(Object &ob,
auto get_material_color = [&](const int64_t curve_i) {
const Material *ma = BKE_object_material_get(&ob, stroke_materials[curve_i]);
const MaterialGPencilStyle *gp_style = ma ? ma->gp_style : nullptr;
return (gp_style ? gp_style->fill_rgba : ColorGeometry4f(0.0f, 0.0f, 0.0f, 0.0f));
return (gp_style ? ColorGeometry4f(gp_style->fill_rgba) :
ColorGeometry4f(0.0f, 0.0f, 0.0f, 0.0f));
};
auto get_curve_factor = [&](const int64_t curve_i) {