Commit: 5bc7b9c3c631b4346efe8415fc6d8a32e87971c7
Author: Campbell Barton
Date: Thu Dec 6 08:45:41 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB5bc7b9c3c631b4346efe8415fc6d8a32e87971c7
Cleanup: unused var, style
===================================================================
M release/scripts/startup/bl_ui/space_topbar.py
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/modes/overlay_mode.c
M source/blender/editors/include/ED_gpencil.h
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_topbar.py
b/release/scripts/startup/bl_ui/space_topbar.py
index 8c8db7ed202..a74683d2849 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -389,7 +389,7 @@ class _draw_left_context_mode:
sub = row.row(align=True)
sub.enabled = tool not in {'GRAB', 'CLONE'}
sub.prop(brush, "use_pressure_radius", text="")
-
+
row = layout.row(align=True)
row.prop(brush, "strength", slider=True)
row.prop(brush, "use_pressure_strength", text="")
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;
diff --git a/source/blender/editors/include/ED_gpencil.h
b/source/blender/editors/include/ED_gpencil.h
index b23f5afef52..3ea0dbf10fa 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -83,7 +83,7 @@ typedef struct tGPspoint {
/* Temporary 'Stroke Point' data (2D / screen-space)
*
- * Used for primitives. See: D4030
+ * Used for primitives. See: D4030
*/
typedef struct tPGPspoint {
float x, y; /* x and y coordinates of cursor (in relative
to area) */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
