From cb0cab48efda03eb4f7f4a3c097be09212fa4fa0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 10 Jun 2021 01:55:46 +1000 Subject: Cleanup: redundant/unused assignments --- source/blender/editors/animation/anim_channels_defines.c | 1 - source/blender/editors/interface/interface_layout.c | 3 +-- source/blender/editors/space_node/node_gizmo.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index d4941950029..0b587191807 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -5462,7 +5462,6 @@ void ANIM_channel_draw_widgets(const bContext *C, prop = RNA_struct_find_property(&ptr, "use_mask_layer"); gp_rna_path = RNA_path_from_ID_to_property(&ptr, prop); if (RNA_path_resolve_property(&id_ptr, gp_rna_path, &ptr, &prop)) { - icon = ICON_LAYER_ACTIVE; if (gpl->flag & GP_LAYER_USE_MASK) { icon = ICON_MOD_MASK; } diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 8f2871ce18b..c04432a2912 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -4042,12 +4042,11 @@ static void ui_litem_layout_column_flow(uiLayout *litem) int emy = 0; int miny = 0; - int w = litem->w - (flow->totcol - 1) * style->columnspace; emh = toth / flow->totcol; /* create column per column */ col = 0; - w = (litem->w - (flow->totcol - 1) * style->columnspace) / flow->totcol; + int w = (litem->w - (flow->totcol - 1) * style->columnspace) / flow->totcol; LISTBASE_FOREACH (uiItem *, item, &litem->items) { ui_item_size(item, &itemw, &itemh); diff --git a/source/blender/editors/space_node/node_gizmo.c b/source/blender/editors/space_node/node_gizmo.c index 28d7e1b8d04..8547c825230 100644 --- a/source/blender/editors/space_node/node_gizmo.c +++ b/source/blender/editors/space_node/node_gizmo.c @@ -97,7 +97,6 @@ static void gizmo_node_backdrop_prop_matrix_set(const wmGizmo *UNUSED(gz), BLI_assert(gz_prop->type->array_length == 16); SpaceNode *snode = gz_prop->custom_func.user_data; snode->zoom = matrix[0][0]; - snode->zoom = matrix[1][1]; snode->xof = matrix[3][0]; snode->yof = matrix[3][1]; } -- cgit v1.2.3