blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-01-28 17:18:56 +11:00
parent 1c905046d1 bff1dae767
commit dfbe415372
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/BKE_bvhutils.h
View File

@ -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;

2
source/blender/bmesh/tools/bmesh_bevel.c
View File

@ -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) {

2
source/blender/editors/sculpt_paint/paint_stroke.c
View File

@ -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;
}
}

2
source/blender/makesrna/intern/rna_mesh.c
View File

@ -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)
{