diff options
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint_toolslots.c | 15 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 15 | ||||
-rw-r--r-- | source/blender/editors/space_text/space_text.c | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 3 |
5 files changed, 24 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 1382b863637..b01c1189fd1 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1128,7 +1128,7 @@ static bool ntree_foreach_texnode_recursive(bNodeTree *nodetree, return true; } -static bool count_texture_nodes_cb(bNode *node, void *userdata) +static bool count_texture_nodes_cb(bNode *UNUSED(node), void *userdata) { (*((int *)userdata))++; return true; diff --git a/source/blender/blenkernel/intern/paint_toolslots.c b/source/blender/blenkernel/intern/paint_toolslots.c index abaf5a96481..a252329b635 100644 --- a/source/blender/blenkernel/intern/paint_toolslots.c +++ b/source/blender/blenkernel/intern/paint_toolslots.c @@ -67,16 +67,21 @@ void BKE_paint_toolslots_init_from_main(struct Main *bmain) for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; paint_toolslots_init(bmain, &ts->imapaint.paint); - if (ts->sculpt) + if (ts->sculpt) { paint_toolslots_init(bmain, &ts->sculpt->paint); - if (ts->vpaint) + } + if (ts->vpaint) { paint_toolslots_init(bmain, &ts->vpaint->paint); - if (ts->wpaint) + } + if (ts->wpaint) { paint_toolslots_init(bmain, &ts->wpaint->paint); - if (ts->uvsculpt) + } + if (ts->uvsculpt) { paint_toolslots_init(bmain, &ts->uvsculpt->paint); - if (ts->gp_paint) + } + if (ts->gp_paint) { paint_toolslots_init(bmain, &ts->gp_paint->paint); + } } } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 9f6db2264d9..91e07dc9f47 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -6414,16 +6414,21 @@ static void lib_link_scene(FileData *fd, Main *main) sce->gpd = newlibadr_us(fd, sce->id.lib, sce->gpd); link_paint(fd, sce, &sce->toolsettings->imapaint.paint); - if (sce->toolsettings->sculpt) + if (sce->toolsettings->sculpt) { link_paint(fd, sce, &sce->toolsettings->sculpt->paint); - if (sce->toolsettings->vpaint) + } + if (sce->toolsettings->vpaint) { link_paint(fd, sce, &sce->toolsettings->vpaint->paint); - if (sce->toolsettings->wpaint) + } + if (sce->toolsettings->wpaint) { link_paint(fd, sce, &sce->toolsettings->wpaint->paint); - if (sce->toolsettings->uvsculpt) + } + if (sce->toolsettings->uvsculpt) { link_paint(fd, sce, &sce->toolsettings->uvsculpt->paint); - if (sce->toolsettings->gp_paint) + } + if (sce->toolsettings->gp_paint) { link_paint(fd, sce, &sce->toolsettings->gp_paint->paint); + } if (sce->toolsettings->sculpt) { sce->toolsettings->sculpt->gravity_object = newlibadr( diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 70985bbb072..c5e90cf247d 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -254,8 +254,9 @@ static int text_context(const bContext *C, const char *member, bContextDataResul return 1; } else if (CTX_data_equals(member, "edit_text")) { - if (st->text) + if (st->text != NULL) { CTX_data_id_pointer_set(result, &st->text->id); + } return 1; } diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 9134e603a87..bf72ce5e598 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -148,8 +148,7 @@ typedef struct bGPDpalette { /* bGPDpalette->flag */ typedef enum eGPDpalette_Flag { /* palette is active */ - A, - PL_PALETTE_ACTIVE = (1 << 0) + PL_PALETTE_ACTIVE = (1 << 0), } eGPDpalette_Flag; /* ***************************************** */ |