blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Cleanup: style

This commit is contained in:
Campbell Barton 2019-02-20 08:26:17 +11:00
parent 6c0cbfcd53
commit 39afc2775f
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/image.c
View File

@ -2671,7 +2671,7 @@ static void image_walk_ntree_all_users(bNodeTree *ntree, void *customdata,
void BKE_image_walk_id_all_users(ID *id, void *customdata,
void callback(Image *ima, ImageUser *iuser, void *customdata))
{
switch(GS(id->name)) {
switch (GS(id->name)) {
case ID_OB:
{
Object *ob = (Object *)id;

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

@ -3380,7 +3380,7 @@ static void mesh_create_loops_lines(
BM_ITER_MESH (bm_edge, &iter, bm, BM_EDGES_OF_MESH) {
/* use_hide always for edit-mode */
if (!BM_elem_flag_test(bm_edge, BM_ELEM_HIDDEN) &&
bm_edge->l != NULL)
bm_edge->l != NULL)
{
BMLoop *bm_loop1 = BM_vert_find_first_loop(bm_edge->v1);
BMLoop *bm_loop2 = BM_vert_find_first_loop(bm_edge->v2);

7
source/blender/draw/modes/object_mode.c
View File

@ -2906,9 +2906,10 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
return;
}
const bool do_outlines = (draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && ((ob->base_flag & BASE_SELECTED) != 0) &&
(draw_ctx->v3d->shading.type != OB_WIRE) &&
((DRW_object_is_renderable(ob) && (ob->dt > OB_WIRE)) || (ob->dt == OB_WIRE));
const bool do_outlines = (
(draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && ((ob->base_flag & BASE_SELECTED) != 0) &&
(draw_ctx->v3d->shading.type != OB_WIRE) &&
((DRW_object_is_renderable(ob) && (ob->dt > OB_WIRE)) || (ob->dt == OB_WIRE)));
const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) == 0);
const bool hide_object_extra = (v3d->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) != 0;

2
source/blender/editors/animation/anim_deps.c
View File

@ -184,7 +184,7 @@ static void animchan_sync_group(bAnimContext *ac, bAnimListElem *ale, bActionGro
}
/* perform syncing updates for F-Curves */
static void animchan_sync_fcurve(bAnimContext *ac, bAnimListElem *ale, FCurve **active_fcurve)
static void animchan_sync_fcurve(bAnimContext *UNUSED(ac), bAnimListElem *ale, FCurve **active_fcurve)
{
FCurve *fcu = (FCurve *)ale->data;
ID *owner_id = ale->id;

2
source/blender/makesrna/intern/rna_image.c
View File

@ -151,7 +151,7 @@ static void rna_ImageUser_update(Main *bmain, Scene *scene, PointerRNA *ptr)
/* Special update for nodetrees to find parent datablock. */
ED_node_tag_update_nodetree(bmain, (bNodeTree *)id, NULL);
}
else {
else {
/* Update material or texture for render preview. */
DEG_id_tag_update(id, 0);
DEG_id_tag_update(id, ID_RECALC_EDITORS);