diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/compositor/intern/COM_Debug.cpp | 18 | ||||
| -rwxr-xr-x | source/blender/datatoc/datatoc_icon.py | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_uv.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 14 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_cloth.c | 8 | ||||
| -rw-r--r-- | source/tests/bl_run_operators.py | 2 |
7 files changed, 24 insertions, 23 deletions
diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp index b57de38522a..f5e3cca976c 100644 --- a/source/blender/compositor/intern/COM_Debug.cpp +++ b/source/blender/compositor/intern/COM_Debug.cpp @@ -399,15 +399,15 @@ void DebugInfo::graphviz(ExecutionSystem *system) #else -std::string DebugInfo::node_name(NodeBase */*node*/) { return ""; } +std::string DebugInfo::node_name(NodeBase * /*node*/) { return ""; } void DebugInfo::convert_started() {} -void DebugInfo::execute_started(ExecutionSystem */*system*/) {} -void DebugInfo::node_added(Node */*node*/) {} -void DebugInfo::node_to_operations(Node */*node*/) {} -void DebugInfo::operation_added(NodeOperation */*operation*/) {} -void DebugInfo::operation_read_write_buffer(NodeOperation */*operation*/) {} -void DebugInfo::execution_group_started(ExecutionGroup */*group*/) {} -void DebugInfo::execution_group_finished(ExecutionGroup */*group*/) {} -void DebugInfo::graphviz(ExecutionSystem */*system*/) {} +void DebugInfo::execute_started(ExecutionSystem * /*system*/) {} +void DebugInfo::node_added(Node * /*node*/) {} +void DebugInfo::node_to_operations(Node * /*node*/) {} +void DebugInfo::operation_added(NodeOperation * /*operation*/) {} +void DebugInfo::operation_read_write_buffer(NodeOperation * /*operation*/) {} +void DebugInfo::execution_group_started(ExecutionGroup * /*group*/) {} +void DebugInfo::execution_group_finished(ExecutionGroup * /*group*/) {} +void DebugInfo::graphviz(ExecutionSystem * /*system*/) {} #endif diff --git a/source/blender/datatoc/datatoc_icon.py b/source/blender/datatoc/datatoc_icon.py index 4f995a3219a..930d588f859 100755 --- a/source/blender/datatoc/datatoc_icon.py +++ b/source/blender/datatoc/datatoc_icon.py @@ -152,4 +152,3 @@ def main(): if __name__ == "__main__": main() - diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 78a4a1cc489..2d0bb488342 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2123,7 +2123,7 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi direction = pup->block->direction; } else if ((pup->but->type == PULLDOWN) || - (uiButGetMenuType(pup->but) != NULL)) + (uiButGetMenuType(pup->but) != NULL)) { direction = UI_DOWN; } diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index c42e3e4b298..4dc2c87ca0a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -169,7 +169,9 @@ static int uv_sculpt_brush_poll(bContext *C) if (!uv_sculpt_brush(C) || !obedit || obedit->type != OB_MESH || !sima || ED_space_image_show_render(sima) || (sima->mode == SI_MODE_PAINT)) + { return 0; + } em = BKE_editmesh_from_object(obedit); ret = EDBM_mtexpoly_check(em); diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index e7b5add64db..93b3b6d4a66 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1572,8 +1572,8 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes } if (treeData.tree && - BLI_bvhtree_ray_cast(treeData.tree, ray_start_local, ray_normal_local, 0.0f, - &hit, treeData.raycast_callback, &treeData) != -1) + BLI_bvhtree_ray_cast(treeData.tree, ray_start_local, ray_normal_local, 0.0f, + &hit, treeData.raycast_callback, &treeData) != -1) { hit.dist += len_diff; hit.dist /= local_scale; @@ -1624,8 +1624,8 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes else { eve = BM_vert_at_index(em->bm, index); - if ((BM_elem_flag_test(eve, BM_ELEM_HIDDEN) || - BM_elem_flag_test(eve, BM_ELEM_SELECT))) + if (BM_elem_flag_test(eve, BM_ELEM_HIDDEN) || + BM_elem_flag_test(eve, BM_ELEM_SELECT)) { test = false; } @@ -1672,9 +1672,9 @@ static bool snapDerivedMesh(short snap_mode, ARegion *ar, Object *ob, DerivedMes else { BMEdge *eed = BM_edge_at_index(em->bm, index); - if ((BM_elem_flag_test(eed, BM_ELEM_HIDDEN) || - BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || - BM_elem_flag_test(eed->v2, BM_ELEM_SELECT))) + if (BM_elem_flag_test(eed, BM_ELEM_HIDDEN) || + BM_elem_flag_test(eed->v1, BM_ELEM_SELECT) || + BM_elem_flag_test(eed->v2, BM_ELEM_SELECT)) { test = false; } diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index f357e353275..cecc39c8e15 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -102,7 +102,7 @@ static void rna_ClothSettings_max_struct_set(struct PointerRNA *ptr, float value static void rna_ClothSettings_max_sewing_set(struct PointerRNA *ptr, float value) { - ClothSimSettings *settings = (ClothSimSettings*)ptr->data; + ClothSimSettings *settings = (ClothSimSettings *)ptr->data; /* check for clipping */ if (value < 0.0f) @@ -131,19 +131,19 @@ static void rna_ClothSettings_mass_vgroup_set(PointerRNA *ptr, const char *value static void rna_ClothSettings_shrink_vgroup_get(PointerRNA *ptr, char *value) { - ClothSimSettings *sim = (ClothSimSettings*)ptr->data; + ClothSimSettings *sim = (ClothSimSettings *)ptr->data; rna_object_vgroup_name_index_get(ptr, value, sim->vgroup_shrink); } static int rna_ClothSettings_shrink_vgroup_length(PointerRNA *ptr) { - ClothSimSettings *sim = (ClothSimSettings*)ptr->data; + ClothSimSettings *sim = (ClothSimSettings *)ptr->data; return rna_object_vgroup_name_index_length(ptr, sim->vgroup_shrink); } static void rna_ClothSettings_shrink_vgroup_set(PointerRNA *ptr, const char *value) { - ClothSimSettings *sim = (ClothSimSettings*)ptr->data; + ClothSimSettings *sim = (ClothSimSettings *)ptr->data; rna_object_vgroup_name_index_set(ptr, value, &sim->vgroup_shrink); } diff --git a/source/tests/bl_run_operators.py b/source/tests/bl_run_operators.py index ad8a6919c91..13bf615b8dc 100644 --- a/source/tests/bl_run_operators.py +++ b/source/tests/bl_run_operators.py @@ -450,7 +450,7 @@ def main(): for operators_test in ((), operators): # Run the operator tests in different contexts run_ops(operators_test, setup_func=lambda: None) - + if USE_FILES: continue |