diff options
| -rw-r--r-- | doc/manpage/blender.1.py | 13 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/mask.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 4 | ||||
| -rw-r--r-- | source/creator/creator.c | 4 |
4 files changed, 6 insertions, 17 deletions
diff --git a/doc/manpage/blender.1.py b/doc/manpage/blender.1.py index 0d43daccc5e..f5a5148f132 100644 --- a/doc/manpage/blender.1.py +++ b/doc/manpage/blender.1.py @@ -30,18 +30,7 @@ import datetime def man_format(data): data = data.replace("-", "\\-") - data = data.replace("\t", " ") - # data = data.replace("$", "\\fI") - - data_ls = [] - for w in data.split(): - if w.startswith("$"): - w = "\\fI" + w[1:] + "\\fR" - - data_ls.append(w) - - data = data[:len(data) - len(data.lstrip())] + " ".join(data_ls) - + data = data.replace("\t", " ") return data # allow passing blender as argument diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c index 6de5c6d8b7b..68500549539 100644 --- a/source/blender/blenkernel/intern/mask.c +++ b/source/blender/blenkernel/intern/mask.c @@ -1839,7 +1839,7 @@ static void interp_weights_uv_v2_apply(const float uv[2], float r_pt[2], const f r_pt[1] += dvec[0] * uv[1]; } -/* when a now points added - resize all shapekey array */ +/* when a new points added - resize all shapekey array */ void BKE_mask_layer_shape_changed_add(MaskLayer *masklay, int index, int do_init, int do_init_interpolate) { diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index cac63b831b8..1c8c618ed9a 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -358,7 +358,7 @@ static void offset_meet(EdgeHalf *e1, EdgeHalf *e2, BMVert *v, BMFace *f, madd_v3_v3fl(off1a, norm_perp1, e1->offset); copy_v3_v3(meetco, off1a); } - else if (fabs(ang - (float)M_PI) < 100.0f * BEVEL_EPSILON) { + else if (fabsf(ang - (float)M_PI) < 100.0f * BEVEL_EPSILON) { /* special case e1 and e2 are antiparallel, so bevel is into * a zero-area face. Just make the offset point on the * common line, at offset distance from v. */ @@ -441,7 +441,7 @@ static void offset_in_two_planes(EdgeHalf *e1, EdgeHalf *e2, EdgeHalf *emid, /* lines are parallel; off1a is a good meet point */ copy_v3_v3(meetco, off1a); } - else if (fabs(ang - (float)M_PI) < 100.0f * BEVEL_EPSILON) { + else if (fabsf(ang - (float)M_PI) < 100.0f * BEVEL_EPSILON) { slide_dist(e2, v, e2->offset, meetco); } else { diff --git a/source/creator/creator.c b/source/creator/creator.c index 34bf541a720..fdd01691232 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -333,7 +333,7 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) printf("\t...will ignore 8 because there is no space between the -f and the frame value\n\n"); printf("Argument Order:\n"); - printf("Arguments are executed in the order they are given. eg\n"); + printf("\targuments are executed in the order they are given. eg\n"); printf("\t\t\"blender --background test.blend --render-frame 1 --render-output /tmp\"\n"); printf("\t...will not render to /tmp because '--render-frame 1' renders before the output path is set\n"); printf("\t\t\"blender --background --render-output /tmp test.blend --render-frame 1\"\n"); @@ -344,7 +344,7 @@ static int print_help(int UNUSED(argc), const char **UNUSED(argv), void *data) printf(" $BLENDER_USER_CONFIG Directory for user configuration files.\n"); printf(" $BLENDER_USER_SCRIPTS Directory for user scripts.\n"); printf(" $BLENDER_SYSTEM_SCRIPTS Directory for system wide scripts.\n"); - printf(" $Directory for user data files (icons, translations, ..).\n"); + printf(" Directory for user data files (icons, translations, ..).\n"); printf(" $BLENDER_SYSTEM_DATAFILES Directory for system wide data files.\n"); printf(" $BLENDER_SYSTEM_PYTHON Directory for system python libraries.\n"); #ifdef WIN32 |