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

8
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -557,7 +557,7 @@ void DM_update_tessface_data(DerivedMesh *dm)
int *polyindex = CustomData_get_layer(fdata, CD_ORIGINDEX);
unsigned int (*loopindex)[4];
/* Should never occure, but better abort than segfault! */
/* Should never occur, but better abort than segfault! */
if (!polyindex)
return;
@@ -619,7 +619,7 @@ void DM_generate_tangent_tessface_data(DerivedMesh *dm, bool generate)
int *polyindex = CustomData_get_layer(fdata, CD_ORIGINDEX);
unsigned int (*loopindex)[4] = NULL;
/* Should never occure, but better abort than segfault! */
/* Should never occur, but better abort than segfault! */
if (!polyindex)
return;
@@ -3517,7 +3517,7 @@ static void mesh_init_origspace(Mesh *mesh)
scale[1] = 1e-9f;
invert_v2(scale);
/* Finally, transform all vcos_2d into ((0, 0), (1, 1)) square and assing them as origspace. */
/* Finally, transform all vcos_2d into ((0, 0), (1, 1)) square and assign them as origspace. */
for (j = 0; j < mp->totloop; j++, lof++) {
add_v2_v2v2(lof->uv, vcos_2d[j], translate);
mul_v2_v2(lof->uv, scale);
@@ -3544,7 +3544,7 @@ static void dm_debug_info_layers(
for (type = 0; type < CD_NUMTYPES; type++) {
if (CustomData_has_layer(cd, type)) {
/* note: doesnt account for multiple layers */
/* note: doesn't account for multiple layers */
const char *name = CustomData_layertype_name(type);
const int size = CustomData_sizeof(type);
const void *pt = getElemDataArray(dm, type);