blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Silence unused vars warning

This commit is contained in:
Dalai Felinto 2017-03-20 09:49:57 +01:00
parent 3f818c7898
commit 01c4e598e5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/space_outliner/outliner_tree.c
View File

@ -1384,11 +1384,10 @@ static void outliner_add_collections_act_layer(SpaceOops *soops, SceneLayer *lay
static void outliner_scene_collections_reorder(
const Scene *scene, TreeElement *insert_element, TreeElement *insert_handle, TreeElementInsertType action)
{
SceneCollection *sc_master = BKE_collection_master(scene);
SceneCollection *sc_insert = insert_element->directdata;
SceneCollection *sc_handle = insert_handle->directdata;
BLI_assert((action == TE_INSERT_INTO) || (sc_handle != sc_master));
BLI_assert((action == TE_INSERT_INTO) || (sc_handle != BKE_collection_master(scene)));
if (action == TE_INSERT_BEFORE) {
BKE_collection_move_above(scene, sc_handle, sc_insert);
}

1
source/blender/editors/transform/transform.c
View File

@ -1720,6 +1720,7 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata)
gpuMatrixBegin3D_legacy(); /* TODO(merwin): finish the 2D matrix API & use here */
unsigned pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT);
UNUSED_VARS(pos); /* silence warning */
BLI_assert(pos == POS_INDEX);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);