Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-08-01 10:24:30 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-08-01 10:24:30 +0300
commit6341380fbf4662aec115d23a04171dbc35ac1b0c (patch)
treebcffd6cb014fe08a7833abeb269bb0b66a6b856a
parent5709021f52d9bb3eaa5f9fc4c11c6d2d96bb60c9 (diff)
Cleanup: warnings
-rw-r--r--source/blender/windowmanager/manipulators/intern/wm_manipulator_group.c1
-rw-r--r--source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp1
2 files changed, 1 insertions, 1 deletions
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