blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: Clang format

This commit is contained in:
Aaron Carlisle 2021-10-25 22:18:45 -04:00
parent 32cc9ff037
commit 4e22a9ab9e
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface_handlers.c
View File

@ -10648,7 +10648,8 @@ static int ui_handle_menu_event(bContext *C,
menu->menuretval = UI_RETURN_OUT;
}
}
else if (saferct && !BLI_rctf_isect_pt(&saferct->parent, (float)event->xy[0], (float)event->xy[1])) {
else if (saferct && !BLI_rctf_isect_pt(
&saferct->parent, (float)event->xy[0], (float)event->xy[1])) {
if (block->flag & UI_BLOCK_OUT_1) {
menu->menuretval = UI_RETURN_OK;
}

30
source/blender/python/generic/bl_math_py_api.c
View File

@ -99,21 +99,21 @@ static PyObject *py_bl_math_lerp(PyObject *UNUSED(self), PyObject *args)
return PyFloat_FromDouble(a * (1.0 - x) + b * x);
}
PyDoc_STRVAR(
py_bl_math_smoothstep_doc,
".. function:: smoothstep(from_value, to_value, value)\n"
"\n"
" Performs smooth interpolation between 0 and 1 as value changes between from and to values.\n"
" Outside the range the function returns the same value as the nearest edge.\n"
"\n"
" :arg from_value: The edge value where the result is 0.\n"
" :type from_value: float\n"
" :arg to_value: The edge value where the result is 1.\n"
" :type to_value: float\n"
" :arg factor: The interpolation value.\n"
" :type factor: float\n"
" :return: The interpolated value in [0.0, 1.0].\n"
" :rtype: float\n");
PyDoc_STRVAR(py_bl_math_smoothstep_doc,
".. function:: smoothstep(from_value, to_value, value)\n"
"\n"
" Performs smooth interpolation between 0 and 1 as value changes between from and "
"to values.\n"
" Outside the range the function returns the same value as the nearest edge.\n"
"\n"
" :arg from_value: The edge value where the result is 0.\n"
" :type from_value: float\n"
" :arg to_value: The edge value where the result is 1.\n"
" :type to_value: float\n"
" :arg factor: The interpolation value.\n"
" :type factor: float\n"
" :return: The interpolated value in [0.0, 1.0].\n"
" :rtype: float\n");
static PyObject *py_bl_math_smoothstep(PyObject *UNUSED(self), PyObject *args)
{
double a, b, x;