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/freestyle/intern | |
parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/freestyle/intern')
-rw-r--r-- | source/blender/freestyle/intern/view_map/ViewMapIO.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp index 3e80c004b5f..f59291d910f 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp @@ -979,7 +979,7 @@ int load(istream& in, ViewMap *vm, ProgressBar *pb) READ(flags); Options::setFlags(flags); - // Read the size of the five ViewMap's lists (with some extra informations for the ViewVertices) + // Read the size of the five ViewMap's lists (with some extra information for the ViewVertices) // and instantiate them (with default costructors) unsigned vs_s, fe_s, fe_rle1, fe_rle2, sv_s, ve_s, vv_s, vv_rle1, vv_rle2; READ(vs_s); @@ -1118,7 +1118,7 @@ int save(ostream& out, ViewMap *vm, ProgressBar *pb) unsigned char flags = Options::getFlags(); WRITE(flags); - // Write the size of the five lists (with some extra informations for the ViewVertices) + // Write the size of the five lists (with some extra information for the ViewVertices) unsigned size; size = vm->ViewShapes().size(); WRITE(size); |