Cleanup: style
authorCampbell Barton <ideasman42@gmail.com>
Sun, 21 Jan 2018 00:41:28 +0000 (11:41 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 21 Jan 2018 00:41:52 +0000 (11:41 +1100)
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_task.h
source/blender/editors/interface/interface_ops.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/imbuf/intern/cineon/dpxlib.c

index 5066759f343c17d0f666517f06fb7713ab80cc7b..11ee8a5ca6f7f6690c34a58762b197a93e7b2566 100644 (file)
@@ -4488,7 +4488,8 @@ Sequence *BKE_sequencer_foreground_frame_get(Scene *scene, int frame)
                /* Only use strips that generate an image, not ones that combine
                 * other strips or apply some effect. */
                if (ELEM(seq->type, SEQ_TYPE_IMAGE, SEQ_TYPE_META, SEQ_TYPE_SCENE,
-                        SEQ_TYPE_MOVIE, SEQ_TYPE_COLOR, SEQ_TYPE_TEXT)) {
+                        SEQ_TYPE_MOVIE, SEQ_TYPE_COLOR, SEQ_TYPE_TEXT))
+               {
                        if (seq->machine > best_machine) {
                                best_seq = seq;
                                best_machine = seq->machine;
index 4e887d21f4f11c1061b13eceacfbce30c678b36f..618f495dbf1845673f84849ab8db92a005917677 100644 (file)
@@ -175,7 +175,7 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc)
        settings.userdata_chunk = &nearest;
        settings.userdata_chunk_size = sizeof(nearest);
        BLI_task_parallel_range(0, calc->numVerts,
-                               &data,shrinkwrap_calc_nearest_vertex_cb_ex,
+                               &data, shrinkwrap_calc_nearest_vertex_cb_ex,
                                &settings);
 
        free_bvhtree_from_mesh(&treeData);
index 8bace2a8d65a632f84b179859dd68006eda548be..5d0f06e95ec930957113453fc92d295f04df24b1 100644 (file)
@@ -1552,7 +1552,7 @@ static void ccgDM_copyFinalLoopArray(DerivedMesh *dm, MLoop *mloop)
                                BLI_edgehash_insert(ehash, medge[i].v1, medge[i].v2, SET_INT_IN_POINTER(i));
                        }
 
-                       atomic_cas_ptr((void**)&ccgdm->ehash, ccgdm->ehash, ehash);
+                       atomic_cas_ptr((void **)&ccgdm->ehash, ccgdm->ehash, ehash);
                }
                BLI_mutex_unlock(&ccgdm->loops_cache_lock);
        }
index 1285e24e567e96d0d9ad14671b66553f5e870a50..d03010af8d232a23a42a4cd048d1ab216cc16d6d 100644 (file)
@@ -182,7 +182,7 @@ typedef struct ParallelRangeSettings {
 } ParallelRangeSettings;
 
 BLI_INLINE void BLI_parallel_range_settings_defaults(
-        ParallelRangeSettingssettings);
+        ParallelRangeSettings *settings);
 
 void BLI_task_parallel_range(
         const int start, const int stop,
@@ -210,7 +210,7 @@ void BLI_task_parallel_mempool(
 
 /* TODO(sergey): Think of a better place for this. */
 BLI_INLINE void BLI_parallel_range_settings_defaults(
-        ParallelRangeSettingssettings)
+        ParallelRangeSettings *settings)
 {
        memset(settings, 0, sizeof(*settings));
        settings->use_threading = true;
index 9c72942a575848226c6d83340a1c875e2a1fdf24..7cf8a3158955c527da19dc82d766a0ddf092f545 100644 (file)
@@ -1147,7 +1147,7 @@ void ED_keymap_ui(wmKeyConfig *keyconf)
         * through until a suitable eyedropper for the active button is found */
        WM_keymap_add_item(keymap, "UI_OT_eyedropper_color", EKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "UI_OT_eyedropper_colorband", EKEY, KM_PRESS, 0, 0);
-       WM_keymap_add_item(keymap, "UI_OT_eyedropper_colorband_point", EKEY, KM_PRESS , KM_ALT, 0);
+       WM_keymap_add_item(keymap, "UI_OT_eyedropper_colorband_point", EKEY, KM_PRESS, KM_ALT, 0);
        WM_keymap_add_item(keymap, "UI_OT_eyedropper_id", EKEY, KM_PRESS, 0, 0);
        WM_keymap_add_item(keymap, "UI_OT_eyedropper_depth", EKEY, KM_PRESS, 0, 0);
 
index 43a83929eb07909b6c2ff20b37c62da4689a228f..90a60a45b27273019d86684b73fa6a215685bd9f 100644 (file)
@@ -2791,7 +2791,8 @@ static int graph_driver_delete_invalid_exec(bContext *C, wmOperator *op)
                DAG_relations_tag_update(CTX_data_main(C));
                WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_REMOVED, NULL);
                WM_reportf(RPT_INFO, "Deleted %u drivers", deleted);
-       } else {
+       }
+       else {
                WM_report(RPT_INFO, "No drivers deleted");
        }
 
index 83fb5f9df0e274880f74cdee1514afe0b8bdfc95..828617d14470d245e498ec496a0b7316eadb8657 100644 (file)
@@ -982,7 +982,7 @@ static void drawcube_size(float size)
                { size,  size,  size}
        };
 
-       const GLubyte indices[24] = {0,1,1,3,3,2,2,0,0,4,4,5,5,7,7,6,6,4,1,5,3,7,2,6};
+       const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6};
 
        glEnableClientState(GL_VERTEX_ARRAY);
        glVertexPointer(3, GL_FLOAT, 0, pos);
@@ -7006,11 +7006,11 @@ static void draw_box(const float vec[8][3], bool solid)
        glVertexPointer(3, GL_FLOAT, 0, vec);
        
        if (solid) {
-               const GLubyte indices[24] = {0,1,2,3,7,6,5,4,4,5,1,0,3,2,6,7,3,7,4,0,1,5,6,2};
+               const GLubyte indices[24] = {0, 1, 2, 3, 7, 6, 5, 4, 4, 5, 1, 0, 3, 2, 6, 7, 3, 7, 4, 0, 1, 5, 6, 2};
                glDrawRangeElements(GL_QUADS, 0, 7, 24, GL_UNSIGNED_BYTE, indices);
        }
        else {
-               const GLubyte indices[24] = {0,1,1,2,2,3,3,0,0,4,4,5,5,6,6,7,7,4,1,5,2,6,3,7};
+               const GLubyte indices[24] = {0, 1, 1, 2, 2, 3, 3, 0, 0, 4, 4, 5, 5, 6, 6, 7, 7, 4, 1, 5, 2, 6, 3, 7};
                glDrawRangeElements(GL_LINES, 0, 7, 24, GL_UNSIGNED_BYTE, indices);
        }
 
index b6e8b43b0099f915d018f74046860056bc28f8d3..d29518fc5bc7dfdfe5925997ac6b97c1fdb21111 100644 (file)
@@ -193,7 +193,7 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf
 
        dpx->srcFormat = format_DPX;
        dpx->numElements = swap_ushort(header.imageHeader.elements_per_image, dpx->isMSB);
-       size_t max_elements = sizeof(header.imageHeader.element)/sizeof(header.imageHeader.element[0]);
+       size_t max_elements = sizeof(header.imageHeader.element) / sizeof(header.imageHeader.element[0]);
        if (dpx->numElements == 0 || dpx->numElements >= max_elements) {
                if (verbose) printf("DPX: Wrong number of elements: %d\n", dpx->numElements);
                logImageClose(dpx);