diff options
| author | YimingWu <xp8110@outlook.com> | 2021-07-04 08:25:58 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2021-07-04 08:25:58 +0300 |
| commit | c56ef6fd89c149a87afe62dffc81c9083dd7a2c2 (patch) | |
| tree | 8056bfb005fbb664e0e09ce84a5ee80397971859 /source/blender/editors/mesh/meshtools.c | |
| parent | 442f269a72e8f07393fd246f642e210171a1c9bc (diff) | |
| parent | b73dc36859e03845f702a3e985b536ac9afef63a (diff) | |
Merge remote-tracking branch 'origin/master' into lineart-bvhlineart-bvh
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index f306612f295..ca68c47cf8e 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -390,7 +390,7 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op) CTX_DATA_END; /* Apply parent transform if the active object's parent was joined to it. - * Note: This doesn't apply recursive parenting. */ + * NOTE: This doesn't apply recursive parenting. */ if (join_parent) { ob->parent = NULL; BKE_object_apply_mat4_ex(ob, ob->obmat, ob->parent, ob->parentinv, false); @@ -1060,7 +1060,7 @@ static float *editmesh_get_mirror_uv( cent_vec[1] = face_cent[1]; } - /* TODO - Optimize */ + /* TODO: Optimize. */ { BMIter iter; BMFace *efa; |