diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-28 09:18:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-28 09:18:56 +0300 |
| commit | dfbe4153721b6764a41c2e8de8f41c6cdab6fe7e (patch) | |
| tree | 9d753f9c88620ead520281b545cf863f479ebeec /source/blender | |
| parent | 1c905046d1da3a37993376f34f9a438244f4a1f3 (diff) | |
| parent | bff1dae7675f67717591e5f8d44b142fee331c2d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_bvhutils.h | 4 | ||||
| -rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_mesh.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h index cb72f0859d5..b3122f8adb9 100644 --- a/source/blender/blenkernel/BKE_bvhutils.h +++ b/source/blender/blenkernel/BKE_bvhutils.h @@ -46,7 +46,7 @@ struct MFace; typedef struct LinkNode BVHCache; /** - * struct that kepts basic information about a BVHTree build from a editmesh + * Struct that stores basic information about a BVHTree built from a edit-mesh. */ typedef struct BVHTreeFromEditMesh { struct BVHTree *tree; @@ -66,7 +66,7 @@ typedef struct BVHTreeFromEditMesh { } BVHTreeFromEditMesh; /** - * struct that kepts basic information about a BVHTree build from a mesh + * Struct that stores basic information about a BVHTree built from a mesh. */ typedef struct BVHTreeFromMesh { struct BVHTree *tree; diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 99384be0299..18b2b4db2bf 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2040,7 +2040,7 @@ static void adjust_offsets(BevelParams *bp) /* Should we auto-limit the error accumulation? Typically, spirals can lead to 100x relative adjustments, * and somewhat hacky mechanism of using bp->limit_offset to indicate "clamp the adjustments" is not - * obvious to users, who almost certainaly want clamping in this situation. + * obvious to users, who almost certainly want clamping in this situation. * The reason not to clamp always is that some models work better without it (e.g., Bent_test in regression * suite, where relative adjust maximum is about .6). */ if (!bp->limit_offset) { diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 0648bd804e0..3982c9a3c30 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -378,7 +378,7 @@ static bool paint_brush_update(bContext *C, else if (!(brush->flag & BRUSH_CURVE)) { if (!paint_calculate_rake_rotation(ups, brush, mouse_init)) { /* Not enough motion to define an angle. */ - if(!stroke->rake_started) { + if (!stroke->rake_started) { is_dry_run = true; } } diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 62360ea34a3..79a9d072ad2 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1667,7 +1667,7 @@ static int rna_MeshPolygonStringPropertyLayer_data_length(PointerRNA *ptr) return me->totpoly; } -/* XXX, we dont have propper byte string support yet, so for now use the (bytes + 1) +/* XXX, we dont have proper byte string support yet, so for now use the (bytes + 1) * bmesh API exposes correct python/bytestring access */ void rna_MeshStringProperty_s_get(PointerRNA *ptr, char *value) { |