blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Philipp Oeser 2020-05-15 19:38:40 +02:00
parent e1c2eba4de e5ace51295
commit 3ff8ca60e9
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
source/blender/editors/animation/fmodifier_ui.c
View File

@ -717,28 +717,31 @@ static void draw_modifier__envelope(uiLayout *layout,
/* control points list */
for (i = 0, fed = env->data; i < env->totvert; i++, fed++) {
PointerRNA ctrl_ptr;
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierEnvelopeControlPoint, fed, &ctrl_ptr);
/* get a new row to operate on */
row = uiLayoutRow(layout, true);
block = uiLayoutGetBlock(row);
UI_block_align_begin(block);
but = uiDefButF(block,
UI_BTYPE_NUM,
B_FMODIFIER_REDRAW,
IFACE_("Fra:"),
0,
0,
4.5 * UI_UNIT_X,
UI_UNIT_Y,
&fed->time,
-MAXFRAMEF,
MAXFRAMEF,
10,
1,
TIP_("Frame that envelope point occurs"));
UI_but_func_set(but, validate_fmodifier_cb, fcm, NULL);
uiDefButF(block,
uiDefButR(block,
UI_BTYPE_NUM,
B_FMODIFIER_REDRAW,
IFACE_("Fra:"),
0,
0,
4.5 * UI_UNIT_X,
UI_UNIT_Y,
&ctrl_ptr,
"frame",
-1,
-MAXFRAMEF,
MAXFRAMEF,
10,
1,
NULL);
uiDefButR(block,
UI_BTYPE_NUM,
B_FMODIFIER_REDRAW,
IFACE_("Min:"),
@ -746,13 +749,15 @@ static void draw_modifier__envelope(uiLayout *layout,
0,
5 * UI_UNIT_X,
UI_UNIT_Y,
&fed->min,
&ctrl_ptr,
"min",
-1,
-UI_FLT_MAX,
UI_FLT_MAX,
10,
2,
TIP_("Minimum bound of envelope at this point"));
uiDefButF(block,
NULL);
uiDefButR(block,
UI_BTYPE_NUM,
B_FMODIFIER_REDRAW,
IFACE_("Max:"),
@ -760,12 +765,14 @@ static void draw_modifier__envelope(uiLayout *layout,
0,
5 * UI_UNIT_X,
UI_UNIT_Y,
&fed->max,
&ctrl_ptr,
"max",
-1,
-UI_FLT_MAX,
UI_FLT_MAX,
10,
2,
TIP_("Maximum bound of envelope at this point"));
NULL);
but = uiDefIconBut(block,
UI_BTYPE_BUT,