diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-01-30 05:28:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-01-30 05:28:17 +0300 |
| commit | 7a27f64ecb5ac4c6cac3a27436d7b25037e62054 (patch) | |
| tree | 06ed10af2ad79e856a967e3c8b42e21e340250b7 /source/blender | |
| parent | ccb3cb0b9b53ef1dbf16bf1fe21182503e2ac128 (diff) | |
Cleanup: clang-format, unused variable
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/displist_tangent.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_dynamicpaint.c | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/displist_tangent.c b/source/blender/blenkernel/intern/displist_tangent.c index 56041f09767..754aa78c0ac 100644 --- a/source/blender/blenkernel/intern/displist_tangent.c +++ b/source/blender/blenkernel/intern/displist_tangent.c @@ -128,11 +128,12 @@ void BKE_displist_tangent_calc(const DispList *dl, float (*fnormals)[3], float ( genTangSpaceDefault(&sContext); } else if (dl->type == DL_SURF) { +#if 0 int vert_len = dl->parts * dl->nr; if (*r_tangent == NULL) { - // *r_tangent = MEM_mallocN(sizeof(float[4]) * vert_len, "displist tangents"); + *r_tangent = MEM_mallocN(sizeof(float[4]) * vert_len, "displist tangents"); } - +#endif /* TODO */ BLI_assert(0); } diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 29626fb6a8f..ef201603b30 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -2902,7 +2902,7 @@ void ED_region_info_draw(ARegion *ar, float fill_color[4], const bool full_redraw) { - ED_region_info_draw_multiline(ar, (const char * [2]){text, NULL}, fill_color, full_redraw); + ED_region_info_draw_multiline(ar, (const char *[2]){text, NULL}, fill_color, full_redraw); } #define MAX_METADATA_STR 1024 diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 19444a3d363..83d8439f046 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -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, |