griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: warnings, clang-format

Browse Source
This commit is contained in:
Campbell Barton
2020-01-28 11:42:24 +11:00
parent 5df494d75c
commit ddda73b98a
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/bmesh/tools/bmesh_intersect_edges.c
View File

@@ -805,7 +805,7 @@ bool BM_mesh_intersect_edges(
e = pair_elem->edge;
if (split_faces) {
/* Tagged edges are ignored when split faces.
/* Untag these. */
* Un-tag these. */
BM_elem_flag_disable(e, BM_ELEM_TAG);
}

3
source/blender/collada/collada_utils.cpp
View File

@@ -1322,7 +1322,8 @@ void bc_add_default_shader(bContext *C, Material *ma)
COLLADASW::ColorOrTexture bc_get_base_color(Material *ma)
{
Color default_color = {ma->r, ma->g, ma->b, 1.0}; // for alpha see bc_get_alpha()
/* for alpha see bc_get_alpha() */
Color default_color = {ma->r, ma->g, ma->b, 1.0};
bNode *shader = bc_get_master_shader(ma);
if (ma->use_nodes && shader) {
return bc_get_cot_from_shader(shader, "Base Color", default_color, false);

2
source/blender/editors/space_view3d/view3d_gizmo_navigate_type.c
View File

@@ -515,7 +515,7 @@ static int gizmo_axis_test_select(bContext *UNUSED(C), wmGizmo *gz, const int mv
return -1;
}
static int gizmo_axis_cursor_get(wmGizmo *gz)
static int gizmo_axis_cursor_get(wmGizmo *UNUSED(gz))
{
return WM_CURSOR_DEFAULT;
}

3
source/blender/modifiers/intern/MOD_dynamicpaint.c
View File

@@ -177,8 +177,7 @@ ModifierTypeInfo modifierType_DynamicPaint = {
/* structName */ "DynamicPaintModifierData",
/* structSize */ sizeof(DynamicPaintModifierData),
/* type */ eModifierTypeType_Constructive,
/* flags */ eModifierTypeFlag_AcceptsMesh |
eModifierTypeFlag_SupportsMapping |
/* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping |
eModifierTypeFlag_UsesPointCache | eModifierTypeFlag_Single |
eModifierTypeFlag_UsesPreview,