[Bf-blender-cvs] [01c4e598e5] blender2.8: Silence unused vars warning

Dalai Felinto noreply at git.blender.org
Mon Mar 20 10:30:30 CET 2017


Commit: 01c4e598e5cb2ccab6a2fcf2fdfb9ea7eb0c7146
Author: Dalai Felinto
Date:   Mon Mar 20 09:49:57 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB01c4e598e5cb2ccab6a2fcf2fdfb9ea7eb0c7146

Silence unused vars warning

===================================================================

M	source/blender/editors/space_outliner/outliner_tree.c
M	source/blender/editors/transform/transform.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 02ec8b314d..a14df17c08 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -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);
 	}
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 529428411e..c0726757bd 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -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);




More information about the Bf-blender-cvs mailing list