diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-20 16:58:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-20 17:01:27 +0300 |
commit | 4e0b5a0baf4f1f3b194f5f869abd2292b0350baf (patch) | |
tree | 615ddd24d4a1628e8650d38a367c9990a9f363a6 | |
parent | 08efcefb470577cafd2587c1b356b028365dd3f9 (diff) |
Cleanup: style
7 files changed, 14 insertions, 12 deletions
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index 148e944c687..e974ebeda5b 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -1133,6 +1133,7 @@ class TOPBAR_PT_name(Panel): if item: row = row_with_icon(layout, 'OBJECT_DATA') row.prop(item, "name", text="") + row.prop(item.data, "name", text="") found = True if not found: diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index d4d5a696128..1c056c9b652 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -1051,8 +1051,8 @@ static ImBuf *movieclip_get_postprocessed_ibuf(MovieClip *clip, /* Fallback render in case proxies are not enabled or built */ if (!ibuf && - user->render_flag & MCLIP_PROXY_RENDER_USE_FALLBACK_RENDER && - user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL) + user->render_flag & MCLIP_PROXY_RENDER_USE_FALLBACK_RENDER && + user->render_size != MCLIP_PROXY_RENDER_SIZE_FULL) { MovieClipUser user_fallback = *user; user_fallback.render_size = MCLIP_PROXY_RENDER_SIZE_FULL; diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 34fb7112789..5f66a1b9cb3 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -900,7 +900,7 @@ void BLI_path_frame_strip(char *path, char *r_ext) c++; int suffix_length = len - (suffix - file); - BLI_strncpy(r_ext, suffix, suffix_length+1); + BLI_strncpy(r_ext, suffix, suffix_length + 1); /* replace the number with the suffix and terminate the string */ while (numdigits--) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 5e8516d744c..a7ea11430b1 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -993,7 +993,8 @@ void ObjectRuntimeBackup::restore_to_object(Object *object) restore_modifier_runtime_data(object); } -void ObjectRuntimeBackup::restore_modifier_runtime_data(Object *object) { +void ObjectRuntimeBackup::restore_modifier_runtime_data(Object *object) +{ LISTBASE_FOREACH(ModifierData *, modifier_data, &object->modifiers) { BLI_assert(modifier_data->orig_modifier_data != NULL); ModifierDataBackupID modifier_data_id = diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 2d8f48f8187..f4f4c6425c2 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -105,7 +105,7 @@ static bool gizmo_calc_rect_view_margin( float scale_xy[2]; if (!gizmo_calc_rect_view_scale(gz, dims, scale_xy)) { return false; - }; + } margin[0] = ((handle_size * scale_xy[0])); margin[1] = ((handle_size * scale_xy[1])); return true; diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index db9f2ca4d87..89053b2658b 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -393,13 +393,13 @@ uint ED_view3d_select_id_read_nearest( } /* Next spiral step. */ - if(spiral_direction == 0) { + if (spiral_direction == 0) { spiral_offset += 1; /* right */ } - else if(spiral_direction == 1) { + else if (spiral_direction == 1) { spiral_offset -= width; /* down */ } - else if(spiral_direction == 2) { + else if (spiral_direction == 2) { spiral_offset -= 1; /* left */ } else { diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 209a2c70400..7e4482790af 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -350,10 +350,10 @@ static bool rna_BrushCapabilitiesSculpt_has_direction_get(PointerRNA *ptr) { Brush *br = (Brush *)ptr->data; return !ELEM(br->sculpt_tool, SCULPT_TOOL_DRAW, SCULPT_TOOL_CLAY, - SCULPT_TOOL_CLAY_STRIPS, SCULPT_TOOL_LAYER, SCULPT_TOOL_INFLATE, - SCULPT_TOOL_BLOB, SCULPT_TOOL_CREASE, SCULPT_TOOL_FLATTEN, - SCULPT_TOOL_FILL, SCULPT_TOOL_SCRAPE, SCULPT_TOOL_CLAY, - SCULPT_TOOL_PINCH, SCULPT_TOOL_MASK); + SCULPT_TOOL_CLAY_STRIPS, SCULPT_TOOL_LAYER, SCULPT_TOOL_INFLATE, + SCULPT_TOOL_BLOB, SCULPT_TOOL_CREASE, SCULPT_TOOL_FLATTEN, + SCULPT_TOOL_FILL, SCULPT_TOOL_SCRAPE, SCULPT_TOOL_CLAY, + SCULPT_TOOL_PINCH, SCULPT_TOOL_MASK); } static bool rna_BrushCapabilitiesSculpt_has_gravity_get(PointerRNA *ptr) |