main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
2 changed files with 4 additions and 2 deletions
Showing only changes of commit e56fe42aab - Show all commits

View File

@ -369,7 +369,10 @@ int BKE_fcurve_pathcache_find_array(struct FCurvePathCache *fcache,
* Calculate the x range of the given F-Curve's data.
* \return true if a range has been found.
*/
bool BKE_fcurve_calc_range(const struct FCurve *fcu, float *r_min, float *r_max, bool selected_keys_only);
bool BKE_fcurve_calc_range(const struct FCurve *fcu,
float *r_min,
float *r_max,
bool selected_keys_only);
/**
* Calculate the x and y extents of F-Curve's data.

View File

@ -2716,7 +2716,6 @@ static void count_multi_input_socket_links(bNodeTree &ntree, SpaceNode &snode)
}
}
static float frame_node_label_height(const NodeFrame &frame_data)
{
return frame_data.label_size * U.dpi_fac;