Commit: a7dc5e12ac4cbfc9cd35f671d49f0386ac0a1e75
Author: Campbell Barton
Date: Sun Jan 21 11:41:28 2018 +1100
Branches: master
https://developer.blender.org/rBa7dc5e12ac4cbfc9cd35f671d49f0386ac0a1e75
Cleanup: style
===================================================================
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/shrinkwrap.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenlib/BLI_task.h
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/imbuf/intern/cineon/dpxlib.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index 5066759f343..11ee8a5ca6f 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -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;
diff --git a/source/blender/blenkernel/intern/shrinkwrap.c
b/source/blender/blenkernel/intern/shrinkwrap.c
index 4e887d21f4f..618f495dbf1 100644
--- a/source/blender/blenkernel/intern/shrinkwrap.c
+++ b/source/blender/blenkernel/intern/shrinkwrap.c
@@ -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);
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c
b/source/blender/blenkernel/intern/subsurf_ccg.c
index 8bace2a8d65..5d0f06e95ec 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -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);
}
diff --git a/source/blender/blenlib/BLI_task.h
b/source/blender/blenlib/BLI_task.h
index 1285e24e567..d03010af8d2 100644
--- a/source/blender/blenlib/BLI_task.h
+++ b/source/blender/blenlib/BLI_task.h
@@ -182,7 +182,7 @@ typedef struct ParallelRangeSettings {
} ParallelRangeSettings;
BLI_INLINE void BLI_parallel_range_settings_defaults(
- ParallelRangeSettings* settings);
+ 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(
- ParallelRangeSettings* settings)
+ ParallelRangeSettings *settings)
{
memset(settings, 0, sizeof(*settings));
settings->use_threading = true;
diff --git a/source/blender/editors/interface/interface_ops.c
b/source/blender/editors/interface/interface_ops.c
index 9c72942a575..7cf8a315895 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -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);
diff --git a/source/blender/editors/space_graph/graph_edit.c
b/source/blender/editors/space_graph/graph_edit.c
index 43a83929eb0..90a60a45b27 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -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");
}
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 83fb5f9df0e..828617d1447 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -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);
}
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c
b/source/blender/imbuf/intern/cineon/dpxlib.c
index b6e8b43b009..d29518fc5bc 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -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);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
