archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-12-08 15:01:47 +11:00
parent 0fe5a78983
commit 1ddfd8c9ec
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -350,7 +350,7 @@ class VIEW3D_MT_editor_menus(Menu):
layout.menu("VIEW3D_MT_edit_mesh_edges") layout.menu("VIEW3D_MT_edit_mesh_edges")
layout.menu("VIEW3D_MT_edit_mesh_faces") layout.menu("VIEW3D_MT_edit_mesh_faces")
layout.menu("VIEW3D_MT_uv_map", text="UV") 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_ctrlpoints")
layout.menu("VIEW3D_MT_edit_curve_segments") layout.menu("VIEW3D_MT_edit_curve_segments")
@@ -3319,7 +3319,7 @@ class VIEW3D_MT_edit_curve_ctrlpoints(Menu):
edit_object = context.edit_object 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.operator("curve.extrude_move")
layout.separator() layout.separator()

4
source/blender/blenlib/intern/system.c
View File

@@ -181,14 +181,14 @@ char *BLI_cpu_brand_string(void)
void BLI_hostname_get(char *buffer, size_t bufsize) void BLI_hostname_get(char *buffer, size_t bufsize)
{ {
#ifndef WIN32 #ifndef WIN32
if (gethostname(buffer, bufsize-1) < 0) { if (gethostname(buffer, bufsize - 1) < 0) {
BLI_strncpy(buffer, "-unknown-", bufsize); BLI_strncpy(buffer, "-unknown-", bufsize);
} }
/* When gethostname() truncates, it doesn't guarantee the trailing \0. */ /* When gethostname() truncates, it doesn't guarantee the trailing \0. */
buffer[bufsize - 1] = '\0'; buffer[bufsize - 1] = '\0';
#else #else
DWORD bufsize_inout = bufsize; DWORD bufsize_inout = bufsize;
if(!GetComputerName(buffer, &bufsize_inout)) { if (!GetComputerName(buffer, &bufsize_inout)) {
strncpy(buffer, "-unknown-", bufsize); strncpy(buffer, "-unknown-", bufsize);
} }
#endif #endif

2
source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
View File

@@ -519,7 +519,7 @@ void DepsgraphRelationBuilder::build_rig(Object *object)
add_relation(bone_segments_key, add_relation(bone_segments_key,
pose_done_key, pose_done_key,
"PoseEval Result-Bone Link", "PoseEval Result-Bone Link",
DEPSREL_FLAG_GODMODE); DEPSREL_FLAG_GODMODE);
add_relation(bone_segments_key, add_relation(bone_segments_key,
pose_cleanup_key, pose_cleanup_key,
"Cleanup dependency"); "Cleanup dependency");

2
source/blender/modifiers/intern/MOD_particleinstance.c
View File

@@ -499,7 +499,7 @@ static Mesh *applyModifier(
const int ml_index = (ml - mloop); const int ml_index = (ml - mloop);
if (mloopcols_index != NULL) { if (mloopcols_index != NULL) {
const int part_index = vert_part_index[ml->v]; 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) { if (mloopcols_value != NULL) {
const float part_value = vert_part_value[ml->v]; const float part_value = vert_part_value[ml->v];