Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +6 -2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f518591abc - Show all commits

4
source/blender/draw/engines/overlay/overlay_edit_uv.cc
View File

@ -324,7 +324,7 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata)
obmat[3][0] = float((active_tile->tile_number - 1001) % 10); obmat[3][0] = float((active_tile->tile_number - 1001) % 10);
obmat[3][1] = float((active_tile->tile_number - 1001) / 10); obmat[3][1] = float((active_tile->tile_number - 1001) / 10);
grp = DRW_shgroup_create(sh, psl->edit_uv_tiled_image_borders_ps); grp = DRW_shgroup_create(sh, psl->edit_uv_tiled_image_borders_ps);
DRW_shgroup_uniform_vec4_copy(grp, "color", selected_color); DRW_shgroup_uniform_vec4_copy(grp, "ucolor", selected_color);
DRW_shgroup_call_obmat(grp, geom, obmat); DRW_shgroup_call_obmat(grp, geom, obmat);
} }
} }
@ -370,7 +370,7 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata)
DRW_shgroup_uniform_bool_copy(grp, "imgPremultiplied", true); DRW_shgroup_uniform_bool_copy(grp, "imgPremultiplied", true);
DRW_shgroup_uniform_bool_copy(grp, "imgAlphaBlend", true); DRW_shgroup_uniform_bool_copy(grp, "imgAlphaBlend", true);
const float4 color = {1.0f, 1.0f, 1.0f, brush->clone.alpha}; const float4 color = {1.0f, 1.0f, 1.0f, brush->clone.alpha};
DRW_shgroup_uniform_vec4_copy(grp, "color", color); DRW_shgroup_uniform_vec4_copy(grp, "ucolor", color);
float size_image[2]; float size_image[2];
BKE_image_get_size_fl(image, nullptr, size_image); BKE_image_get_size_fl(image, nullptr, size_image);

4
source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc
View File

@ -92,6 +92,10 @@ class ColorRampShaderNode : public ShaderNode {
GPU_uniform(&color_band->data[0].r), GPU_uniform(&color_band->data[0].r),
GPU_uniform(&color_band->data[1].r)); GPU_uniform(&color_band->data[1].r));
return; return;
case COLBAND_INTERP_B_SPLINE:
case COLBAND_INTERP_CARDINAL:
/* Not optimized yet. Fallback to gradient texture. */
break;
default: default:
BLI_assert_unreachable(); BLI_assert_unreachable();
return; return;