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-02-03 16:10:01 +01:00
parent 065a84c8d0 db989e1f11
commit 1bc0cd0071
32 changed files with 516 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/blender/blender_mesh.cpp
View File

@@ -97,8 +97,11 @@ struct MikkUserData {
if(layer_name == NULL) {
Attribute *attr_orco = attributes.find(ATTR_STD_GENERATED);
orco = attr_orco->data_float3();
mesh_texture_space(*(BL::Mesh*)&b_mesh, orco_loc, orco_size);
if(attr_orco) {
orco = attr_orco->data_float3();
mesh_texture_space(*(BL::Mesh*)&b_mesh, orco_loc, orco_size);
}
}
else {
Attribute *attr_uv = attributes.find(ustring(layer_name));