[Bf-blender-cvs] [6341380fbf4] blender2.8: Cleanup: warnings

Campbell Barton noreply at git.blender.org
Tue Aug 1 09:10:17 CEST 2017


Commit: 6341380fbf4662aec115d23a04171dbc35ac1b0c
Author: Campbell Barton
Date:   Tue Aug 1 17:24:30 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB6341380fbf4662aec115d23a04171dbc35ac1b0c

Cleanup: warnings

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

M	source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
M	source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

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

diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
index 237beddd02c..5ddd82c6e15 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c
@@ -251,6 +251,7 @@ static int manipulator_select_invoke(bContext *C, wmOperator *op, const wmEvent
 	if (extend == false && deselect == false && toggle == false) {
 		wm_manipulatormap_deselect_all(mmap);
 		BLI_assert(msel->items == NULL && msel->len == 0);
+		UNUSED_VARS_NDEBUG(msel);
 	}
 
 	if (highlight) {
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
index 80c399fb256..d1c3162f752 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
@@ -770,7 +770,6 @@ static RAS_MeshSlot *current_ms;
 static RAS_MeshObject *current_mesh;
 static int current_blmat_nr;
 static GPUVertexAttribs current_gpu_attribs;
-static Image *current_image;
 static int CheckMaterialDM(int matnr, void *attribs)
 {
 	// only draw the current material




More information about the Bf-blender-cvs mailing list