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

while looking into a problem in interface.c, noticed ui_get_but_val() is called frequently when the return value isn't used (no functional change).

Browse Source
This commit is contained in:
Campbell Barton
2011-03-18 05:42:16 +00:00
parent a0c8727b34
commit 2c13a6fab8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface.c
View File

@@ -914,15 +914,14 @@ void uiDrawBlock(const bContext *C, uiBlock *block)
static void ui_is_but_sel(uiBut *but)
{
double value;
int lvalue;
double value; /* only initialized when needed, to avoid calling when not used */
short push=0, true=1;
value= ui_get_but_val(but);
if(ELEM3(but->type, TOGN, ICONTOGN, OPTIONN)) true= 0;
if( but->bit ) {
int lvalue;
value= ui_get_but_val(but);
lvalue= (int)value;
if( BTST(lvalue, (but->bitnr)) ) push= true;
else push= !true;
@@ -943,15 +942,18 @@ static void ui_is_but_sel(uiBut *but)
case BUT_TOGDUAL:
case ICONTOG:
case OPTION:
value= ui_get_but_val(but);
if(value!=but->hardmin) push= 1;
break;
case ICONTOGN:
case TOGN:
case OPTIONN:
value= ui_get_but_val(but);
if(value==0.0) push= 1;
break;
case ROW:
case LISTROW:
value= ui_get_but_val(but);
/* support for rna enum buts */
if(but->rnaprop && (RNA_property_flag(but->rnaprop) & PROP_ENUM_FLAG)) {
if((int)value & (int)but->hardmax) push= 1;