Commit: b12f3cbee73633d663f9b3811827deaf79f3031b Author: Campbell Barton Date: Sat Feb 7 04:33:48 2015 +1100 Branches: master https://developer.blender.org/rBb12f3cbee73633d663f9b3811827deaf79f3031b
cleanup: style =================================================================== M source/blender/blenkernel/BKE_blender.h M source/blender/blenkernel/BKE_library.h M source/blender/blenkernel/intern/blender.c M source/blender/blenkernel/intern/group.c M source/blender/blenkernel/intern/library.c M source/blender/blenkernel/intern/shrinkwrap.c M source/blender/blenkernel/intern/text.c M source/blender/blenlib/intern/path_util.c M source/blender/blenlib/intern/polyfill2d_beautify.c M source/blender/blenlib/intern/system.c M source/blender/collada/ControllerExporter.cpp M source/blender/editors/animation/keyframes_general.c M source/blender/editors/armature/armature_select.c M source/blender/editors/interface/interface_layout.c M source/blender/editors/object/object_vgroup.c M source/blender/editors/screen/glutil.c M source/blender/editors/space_clip/clip_buttons.c M source/blender/editors/space_outliner/outliner_select.c M source/blender/editors/space_sequencer/sequencer_edit.c M source/blender/editors/util/undo.c M source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp M source/blender/freestyle/intern/stroke/StrokeRep.cpp M source/blender/gpu/intern/gpu_select.c M source/blender/imbuf/intern/tiff.c M source/blender/modifiers/intern/MOD_wireframe.c M source/blender/windowmanager/intern/wm_operators.c M source/gameengine/GameLogic/SCA_IScene.cpp =================================================================== diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 0c10b20..2c53a24 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -88,7 +88,7 @@ void BKE_userdef_free(void); void BKE_userdef_state(void); /* set this callback when a UI is running */ -void set_blender_test_break_cb(void (*func)(void) ); +void set_blender_test_break_cb(void (*func)(void)); int blender_test_break(void); #define BKE_UNDO_STR_MAX 64 diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index 500c281..e88a4e8 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -107,8 +107,8 @@ void BKE_library_make_local(struct Main *bmain, struct Library *lib, bool untagg struct ID *BKE_libblock_find_name_ex(struct Main *bmain, const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); struct ID *BKE_libblock_find_name(const short type, const char *name) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); -void set_free_windowmanager_cb(void (*func)(struct bContext *, struct wmWindowManager *) ); -void set_free_notifier_reference_cb(void (*func)(const void *) ); +void set_free_windowmanager_cb(void (*func)(struct bContext *, struct wmWindowManager *)); +void set_free_notifier_reference_cb(void (*func)(const void *)); /* use when "" is given to new_id() */ #define ID_FALLBACK_NAME N_("Untitled") diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 78b937c..fb02af1 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -573,7 +573,7 @@ int BKE_write_file_userdef(const char *filepath, ReportList *reports) static void (*blender_test_break_cb)(void) = NULL; -void set_blender_test_break_cb(void (*func)(void) ) +void set_blender_test_break_cb(void (*func)(void)) { blender_test_break_cb = func; } diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 96eb959..ae3ab83 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -219,8 +219,8 @@ static int group_object_unlink_internal(Group *group, Object *ob) return removed; } -static bool group_object_cyclic_check_internal(Object *object, Group *group) { - +static bool group_object_cyclic_check_internal(Object *object, Group *group) +{ if (object->dup_group) { Group *dup_group = object->dup_group; if ((dup_group->id.flag & LIB_DOIT) == 0) { diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 4cb792d..a5691d6 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1571,7 +1571,7 @@ void test_idbutton(char *name) ID *idtest; - lb = which_libbase(G.main, GS(name) ); + lb = which_libbase(G.main, GS(name)); if (lb == NULL) return; /* search for id */ @@ -1590,7 +1590,7 @@ void rename_id(ID *id, const char *name) ListBase *lb; BLI_strncpy(id->name + 2, name, sizeof(id->name) - 2); - lb = which_libbase(G.main, GS(id->name) ); + lb = which_libbase(G.main, GS(id->name)); new_id(lb, id, name); } diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index d918186..2ff81cd 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -89,7 +89,7 @@ static void shrinkwrap_calc_nearest_vertex(ShrinkwrapCalcData *calc) nearest.index = -1; nearest.dist_sq = FLT_MAX; #ifndef __APPLE__ -#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(treeData, calc) schedule(static) if(calc->numVerts > BKE_MESH_OMP_LIMIT) +#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(treeData, calc) schedule(static) if (calc->numVerts > BKE_MESH_OMP_LIMIT) #endif for (i = 0; i < calc->numVerts; ++i) { float *co = calc->vertexCos[i]; @@ -394,7 +394,7 @@ static void shrinkwrap_calc_nearest_surface_point(ShrinkwrapCalcData *calc) /* Find the nearest vertex */ #ifndef __APPLE__ -#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(calc, treeData) schedule(static) if(calc->numVerts > BKE_MESH_OMP_LIMIT) +#pragma omp parallel for default(none) private(i) firstprivate(nearest) shared(calc, treeData) schedule(static) if (calc->numVerts > BKE_MESH_OMP_LIMIT) #endif for (i = 0; i < calc->numVerts; ++i) { float *co = calc->vertexCos[i]; diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 111a4ca..c5a8cbe 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -685,7 +685,7 @@ void BKE_text_clear(Text *text) /* called directly from rna */ { int oldstate; - oldstate = txt_get_undostate( ); + oldstate = txt_get_undostate(); txt_set_undostate(1); txt_sel_all(text); txt_delete_sel(text); diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index cc9fbc8..fb4c31d 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -346,7 +346,7 @@ void BLI_cleanup_path(const char *relabase, char *path) /* Note * memmove(start, eind, strlen(eind) + 1); * is the same as - * strcpy( start, eind ); + * strcpy(start, eind); * except strcpy should not be used because there is overlap, * so use memmove's slightly more obscure syntax - Campbell */ diff --git a/source/blender/blenlib/intern/polyfill2d_beautify.c b/source/blender/blenlib/intern/polyfill2d_beautify.c index 1f4b598..ba71f52 100644 --- a/source/blender/blenlib/intern/polyfill2d_beautify.c +++ b/source/blender/blenlib/intern/polyfill2d_beautify.c @@ -238,7 +238,7 @@ static void polyedge_beauty_cost_update_single( /* recalculate edge */ const float cost = polyedge_rotate_beauty_calc(coords, tris, e); /* We can get cases where both choices generate very small negative costs, which leads to infinite loop. - * Anyway, costs above that are not worth recomputing, maybe we could even optimze it to a smaller limit? + * Anyway, costs above that are not worth recomputing, maybe we could even optimize it to a smaller limit? * See T43578. */ if (cost < -FLT_EPSILON) { eheap_table[i] = BLI_heap_insert(eheap, cost, e); diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c index 51b8efb..d83077e 100644 --- a/source/blender/blenlib/intern/system.c +++ b/source/blender/blenlib/intern/system.c @@ -115,7 +115,7 @@ void BLI_system_backtrace(FILE *fp) symbolinfo->SizeOfStruct = sizeof(SYMBOL_INFO); for (i = 0; i < nframes; i++) { - SymFromAddr(process, ( DWORD64 )( stack[ i ] ), 0, symbolinfo); + SymFromAddr(process, (DWORD64)(stack[i]), 0, symbolinfo); fprintf(fp, "%u: %s - 0x%0X\n", nframes - i - 1, symbolinfo->Name, symbolinfo->Address); } diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 25fd9c8..16c3f68 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -473,7 +473,7 @@ static float get_property(Bone *bone, const char *key, float def) if (bone->prop) { IDProperty *property = IDP_GetPropertyFromGroup(bone->prop, key); if (property) { - switch(property->type) { + switch (property->type) { case IDP_INT: result = (float)(IDP_Int(property)); break; diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c index 3784cd5..932a00d 100644 --- a/source/blender/editors/animation/keyframes_general.c +++ b/source/blender/editors/animation/keyframes_general.c @@ -641,7 +641,7 @@ static void flip_names(tAnimCopybufItem *aci, char **name) str_iter = *name = MEM_mallocN(sizeof(char) * (prefix_l + postfix_l + length + 1), "flipped_path"); BLI_strncpy(str_iter, aci->rna_path, prefix_l + 1); - str_iter += prefix_l ; + str_iter += prefix_l; BLI_strncpy(str_iter, bname_new, length + 1); str_iter += length; BLI_strncpy(str_iter, str_end, postfix_l + 1); diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c index c6ef76c..307e6c0 100644 --- a/source/blender/editors/armature/armature_select.c +++ b/source/blender/editors/armature/armature_select.c @@ -254,7 +254,7 @@ static int armature_select_linked_invoke(bContext *C, wmOperator *op, const wmEv static int armature_select_linked_poll(bContext *C) { - return (ED_operator_view3d_active(C) && ED_operator_editarmature(C) ); + return (ED_operator_view3d_active(C) && ED_operator_editarmature(C)); } void ARMATURE_OT_select_linked(wmOperatorType *ot) diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 9d1b312..fb73b8e 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1004,7 +1004,7 @@ void uiItemEnumO_value(uiLayout *layout, const char *name, int icon, const char PointerRNA ptr; PropertyRNA *prop; - UI_OPERATOR_ERROR_RET(ot, opname, return ); + UI_OPERATOR_ERROR_RET(ot, opname, return); WM_operator_properties_create_ptr(&ptr, ot); @@ -1036,7 +1036,7 @@ void uiItemEnumO_string(uiLayout *layout, const char *name, int icon, const char int value; bool free; - UI_OPERATOR_ERROR_RET(ot, opname, return ); + UI_OPERATOR_ERROR_RET(ot, opname, return); WM_operator_properties_create_ptr(&ptr, ot); @@ -1075,7 +1075,7 @@ void uiItemBooleanO(uiLayout *layout, const char *name, int icon, const char *op wmOperatorType *ot = WM_operatortype_find(opname, 0); /* print error next */ PointerRNA ptr; - UI_OPERATOR_ERROR_RET(ot, opname, return ); + UI_OPERATOR_ERROR_RET(ot, opname, return); WM_operator_properties_create_ptr(&ptr, ot); RNA_boolean_set(&ptr, propname, value); @@ -1088,7 +1088,7 @@ void uiItemIntO(uiLayout *layout, const @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs