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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-09-24 17:41:46 +02:00
parent fe52a05e95 0cff044d84
commit 253dce07d7
111 changed files with 183 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/physics/intern/BPH_mass_spring.cpp
View File

@@ -593,7 +593,7 @@ BLI_INLINE void cloth_get_grid_location(Implicit_Data *data, float cell_scale, c
add_v3_v3(x, cell_offset);
}
/* returns next spring forming a continous hair sequence */
/* returns next spring forming a continuous hair sequence */
BLI_INLINE LinkNode *hair_spring_next(LinkNode *spring_link)
{
ClothSpring *spring = (ClothSpring *)spring_link->link;

2
source/blender/physics/intern/ConstrainedConjugateGradient.h
View File

@@ -175,7 +175,7 @@ struct traits<ConstrainedConjugateGradient<_MatrixType,_UpLo,_FilterMatrixType,_
* ++i;
* } while (cg.info()!=Success && i<100);
* \endcode
* Note that such a step by step excution is slightly slower.
* Note that such a step by step execution is slightly slower.
*
* \sa class SimplicialCholesky, DiagonalPreconditioner, IdentityPreconditioner
*/

2
source/blender/physics/intern/implicit_blender.c
View File

@@ -384,7 +384,7 @@ DO_INLINE void inverse_fmatrix(float to[3][3], float from[3][3])
int i2=(i+2)%3;
int j1=(j+1)%3;
int j2=(j+2)%3;
/** Reverse indexs i&j to take transpose. */
/** Reverse indexes i&j to take transpose. */
to[j][i] = (from[i1][j1]*from[i2][j2]-from[i1][j2]*from[i2][j1])/d;
/**
* <pre>