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>2018-12-06 00:45:41 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-06 00:45:41 +0300
commit5bc7b9c3c631b4346efe8415fc6d8a32e87971c7 (patch)
tree900c2744122d243569912c03c0f2afb275dffcde /source/blender/draw
parent5103fa4ae73fbaba9b972d13dec68f0c72a145b2 (diff)
Cleanup: unused var, style
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_mesh.c3
-rw-r--r--source/blender/draw/modes/overlay_mode.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 44c783fb51b..2c924ebce74 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -4399,7 +4399,7 @@ static GPUVertBuf *mesh_batch_cache_create_edges_overlay_texture_buf(
GPU_vertbuf_attr_set(vbo, index_id, vidx++, &vdata[e]);
}
else {
- GPU_vertbuf_attr_set(vbo, index_id, vidx_end+e, &vdata[e]);
+ GPU_vertbuf_attr_set(vbo, index_id, vidx_end + e, &vdata[e]);
}
}
}
@@ -5128,6 +5128,7 @@ void DRW_mesh_batch_cache_get_wireframes_face_texbuf(
if (p_origindex == NULL) {
bm_mapped = NULL;
}
+ UNUSED_VARS(bm_mapped);
me_fake = *me->edit_btmesh->mesh_eval_final;
me_fake.mat = me->mat;
diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index 46330d4d81c..912c8cdec49 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -265,7 +265,7 @@ static void overlay_cache_populate(void *vedata, Object *ob)
/* Don't do that in edit Mesh mode, unless there is a modifier preview. */
if ((((ob != draw_ctx->object_edit) && !BKE_object_is_in_editmode(ob)) || has_edit_mesh_cage) ||
- ob->type != OB_MESH)
+ ob->type != OB_MESH)
{
const bool is_active = (ob == draw_ctx->obact);
const bool is_sculpt_mode = is_active && (draw_ctx->object_mode & OB_MODE_SCULPT) != 0;