diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
| commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
| tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /source/blender/modifiers/intern/MOD_weightvgproximity.c | |
| parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
| parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_weightvgproximity.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 4a5a54642ef..3e1ec447dde 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -85,7 +85,7 @@ typedef struct Vert2GeomData { float *dist[3]; } Vert2GeomData; -/* Data which is localized to each computed chunk (i.e. thread-safe, and with continous subset of index range). */ +/* Data which is localized to each computed chunk (i.e. thread-safe, and with continuous subset of index range). */ typedef struct Vert2GeomDataChunk { /* Read-only data */ float last_hit_co[3][3]; |