[Bf-blender-cvs] [1ddfd8c9ec1] blender2.8: Cleanup: style
Campbell Barton
noreply at git.blender.org
Sat Dec 8 05:02:01 CET 2018
Commit: 1ddfd8c9ec1d61fa62dfe6adb37c4789476bc4e6
Author: Campbell Barton
Date: Sat Dec 8 15:01:47 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB1ddfd8c9ec1d61fa62dfe6adb37c4789476bc4e6
Cleanup: style
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenlib/intern/system.c
M source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
M source/blender/modifiers/intern/MOD_particleinstance.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 6fef07c8284..4fc247cc8f5 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -350,7 +350,7 @@ class VIEW3D_MT_editor_menus(Menu):
layout.menu("VIEW3D_MT_edit_mesh_edges")
layout.menu("VIEW3D_MT_edit_mesh_faces")
layout.menu("VIEW3D_MT_uv_map", text="UV")
- elif mode_string in ['EDIT_CURVE', 'EDIT_SURFACE']:
+ elif mode_string in {'EDIT_CURVE', 'EDIT_SURFACE'}:
layout.menu("VIEW3D_MT_edit_curve_ctrlpoints")
layout.menu("VIEW3D_MT_edit_curve_segments")
@@ -3319,7 +3319,7 @@ class VIEW3D_MT_edit_curve_ctrlpoints(Menu):
edit_object = context.edit_object
- if edit_object.type in ['CURVE', 'SURFACE']:
+ if edit_object.type in {'CURVE', 'SURFACE'}:
layout.operator("curve.extrude_move")
layout.separator()
diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c
index 5ff1d4ed710..c1a7846c4b1 100644
--- a/source/blender/blenlib/intern/system.c
+++ b/source/blender/blenlib/intern/system.c
@@ -181,14 +181,14 @@ char *BLI_cpu_brand_string(void)
void BLI_hostname_get(char *buffer, size_t bufsize)
{
#ifndef WIN32
- if (gethostname(buffer, bufsize-1) < 0) {
+ if (gethostname(buffer, bufsize - 1) < 0) {
BLI_strncpy(buffer, "-unknown-", bufsize);
}
/* When gethostname() truncates, it doesn't guarantee the trailing \0. */
buffer[bufsize - 1] = '\0';
#else
DWORD bufsize_inout = bufsize;
- if(!GetComputerName(buffer, &bufsize_inout)) {
+ if (!GetComputerName(buffer, &bufsize_inout)) {
strncpy(buffer, "-unknown-", bufsize);
}
#endif
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index ef021c09824..efedf847515 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -519,7 +519,7 @@ void DepsgraphRelationBuilder::build_rig(Object *object)
add_relation(bone_segments_key,
pose_done_key,
"PoseEval Result-Bone Link",
- DEPSREL_FLAG_GODMODE);
+ DEPSREL_FLAG_GODMODE);
add_relation(bone_segments_key,
pose_cleanup_key,
"Cleanup dependency");
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index db552fa2122..0a5b34c90ee 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -499,7 +499,7 @@ static Mesh *applyModifier(
const int ml_index = (ml - mloop);
if (mloopcols_index != NULL) {
const int part_index = vert_part_index[ml->v];
- store_float_in_vcol(&mloopcols_index[ml_index], (float)part_index / (float)(psys->totpart-1));
+ store_float_in_vcol(&mloopcols_index[ml_index], (float)part_index / (float)(psys->totpart - 1));
}
if (mloopcols_value != NULL) {
const float part_value = vert_part_value[ml->v];
More information about the Bf-blender-cvs
mailing list