kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: unused var, style

Browse Source
This commit is contained in:
Campbell Barton 2018-12-06 08:45:41 +11:00
parent 5103fa4ae7
commit 5bc7b9c3c6
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -389,7 +389,7 @@ class _draw_left_context_mode:
sub = row.row(align=True) sub = row.row(align=True)
sub.enabled = tool not in {'GRAB', 'CLONE'} sub.enabled = tool not in {'GRAB', 'CLONE'}
sub.prop(brush, "use_pressure_radius", text="") sub.prop(brush, "use_pressure_radius", text="")
row = layout.row(align=True) row = layout.row(align=True)
row.prop(brush, "strength", slider=True) row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="") row.prop(brush, "use_pressure_strength", text="")

3
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@ -4399,7 +4399,7 @@ static GPUVertBuf *mesh_batch_cache_create_edges_overlay_texture_buf(
GPU_vertbuf_attr_set(vbo, index_id, vidx++, &vdata[e]); GPU_vertbuf_attr_set(vbo, index_id, vidx++, &vdata[e]);
} }
else { 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) { if (p_origindex == NULL) {
bm_mapped = NULL; bm_mapped = NULL;
} }
UNUSED_VARS(bm_mapped);
me_fake = *me->edit_btmesh->mesh_eval_final; me_fake = *me->edit_btmesh->mesh_eval_final;
me_fake.mat = me->mat; me_fake.mat = me->mat;

2
source/blender/draw/modes/overlay_mode.c
View File

@ -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. */ /* 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) || 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_active = (ob == draw_ctx->obact);
const bool is_sculpt_mode = is_active && (draw_ctx->object_mode & OB_MODE_SCULPT) != 0; const bool is_sculpt_mode = is_active && (draw_ctx->object_mode & OB_MODE_SCULPT) != 0;

2
source/blender/editors/include/ED_gpencil.h
View File

@ -83,7 +83,7 @@ typedef struct tGPspoint {
/* Temporary 'Stroke Point' data (2D / screen-space) /* Temporary 'Stroke Point' data (2D / screen-space)
* *
* Used for primitives. See: D4030 * Used for primitives. See: D4030
*/ */
typedef struct tPGPspoint { typedef struct tPGPspoint {
float x, y; /* x and y coordinates of cursor (in relative to area) */ float x, y; /* x and y coordinates of cursor (in relative to area) */