Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Wed, 20 Mar 2019 13:58:01 +0000 (00:58 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 20 Mar 2019 14:01:27 +0000 (01:01 +1100)
release/scripts/startup/bl_ui/space_topbar.py
source/blender/blenkernel/intern/movieclip.c
source/blender/blenlib/intern/path_util.c
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/makesrna/intern/rna_brush.c

index 148e944..e974ebe 100644 (file)
@@ -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:
index d4d5a69..1c056c9 100644 (file)
@@ -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;
index 34fb711..5f66a1b 100644 (file)
@@ -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--) {
index 5e8516d..a7ea114 100644 (file)
@@ -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 =
index 2d8f48f..f4f4c64 100644 (file)
@@ -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;
index db9f2ca..89053b2 100644 (file)
@@ -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 {
index 209a2c7..7e44827 100644 (file)
@@ -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)