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

Clenaup: odd use of ternary operators

Browse Source
This commit is contained in:
Campbell Barton
2019-04-16 12:09:34 +02:00
parent f37a27b074
commit 758bb8c70d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1706,7 +1706,7 @@ int ui_but_is_pushed_ex(uiBut *but, double *value)
int is_push = 0; int is_push = 0;
if (but->bit) { if (but->bit) {
const bool state = ELEM(but->type, UI_BTYPE_TOGGLE_N, UI_BTYPE_ICON_TOGGLE_N, UI_BTYPE_CHECKBOX_N) ? false : true; const bool state = !ELEM(but->type, UI_BTYPE_TOGGLE_N, UI_BTYPE_ICON_TOGGLE_N, UI_BTYPE_CHECKBOX_N);
int lvalue; int lvalue;
UI_GET_BUT_VALUE_INIT(but, *value); UI_GET_BUT_VALUE_INIT(but, *value);
lvalue = (int)*value; lvalue = (int)*value;

2
source/blender/editors/sculpt_paint/paint_cursor.c
View File

@@ -798,7 +798,7 @@ static void paint_draw_alpha_overlay(
{ {
/* Color means that primary brush texture is colored and /* Color means that primary brush texture is colored and
* secondary is used for alpha/mask control. */ * secondary is used for alpha/mask control. */
bool col = ELEM(mode, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D, PAINT_MODE_VERTEX) ? true : false; bool col = ELEM(mode, PAINT_MODE_TEXTURE_3D, PAINT_MODE_TEXTURE_2D, PAINT_MODE_VERTEX);
eOverlayControlFlags flags = BKE_paint_get_overlay_flags(); eOverlayControlFlags flags = BKE_paint_get_overlay_flags();
gpuPushAttr(GPU_DEPTH_BUFFER_BIT | GPU_BLEND_BIT); gpuPushAttr(GPU_DEPTH_BUFFER_BIT | GPU_BLEND_BIT);