archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #27213: editing color ramp "Pos:" number value did not update the ramp

Browse Source 
properly, when moving the current point before another.
This commit is contained in:
Brecht Van Lommel
2012-02-02 14:07:24 +00:00
parent 8f01ad9bf8
commit 4aaf59324e
4 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3607,31 +3607,6 @@ static int ui_do_but_HSVCIRCLE(bContext *C, uiBlock *block, uiBut *but, uiHandle
}
static int verg_colorband(const void *a1, const void *a2)
{
const CBData *x1=a1, *x2=a2;
if( x1->pos > x2->pos ) return 1;
else if( x1->pos < x2->pos) return -1;
return WM_UI_HANDLER_CONTINUE;
}
static void ui_colorband_update(ColorBand *coba)
{
int a;
if(coba->tot<2) return;
for(a=0; a<coba->tot; a++) coba->data[a].cur= a;
qsort(coba->data, coba->tot, sizeof(CBData), verg_colorband);
for(a=0; a<coba->tot; a++) {
if(coba->data[a].cur==coba->cur) {
coba->cur= a;
break;
}
}
}
static int ui_numedit_but_COLORBAND(uiBut *but, uiHandleButtonData *data, int mx)
{
float dx;
@@ -3644,7 +3619,7 @@ static int ui_numedit_but_COLORBAND(uiBut *but, uiHandleButtonData *data, int mx
data->dragcbd->pos += dx;
CLAMP(data->dragcbd->pos, 0.0f, 1.0f);
ui_colorband_update(data->coba);
colorband_update_sort(data->coba);
data->dragcbd= data->coba->data + data->coba->cur; /* because qsort */
data->draglastx= mx;