[Bf-blender-cvs] [3cbc5dd90e3] master: Object: check for negative index access with duplicator reading UV's
Campbell Barton
noreply at git.blender.org
Tue Sep 22 08:01:57 CEST 2020
Commit: 3cbc5dd90e3fc84dead86d2ae48176cf3beecc82
Author: Campbell Barton
Date: Tue Sep 22 15:54:17 2020 +1000
Branches: master
https://developer.blender.org/rB3cbc5dd90e3fc84dead86d2ae48176cf3beecc82
Object: check for negative index access with duplicator reading UV's
===================================================================
M source/blender/blenkernel/intern/object_dupli.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object_dupli.c b/source/blender/blenkernel/intern/object_dupli.c
index ceb744d2fe0..39d6ee2700c 100644
--- a/source/blender/blenkernel/intern/object_dupli.c
+++ b/source/blender/blenkernel/intern/object_dupli.c
@@ -1080,7 +1080,9 @@ static void make_duplis_faces(const DupliContext *ctx)
.vert_coords = vert_coords,
.has_orco = (vert_coords != NULL),
.has_uvs = (uv_idx != -1),
- .cd_loop_uv_offset = CustomData_get_n_offset(&em->bm->ldata, CD_MLOOPUV, uv_idx),
+ .cd_loop_uv_offset = (uv_idx != -1) ?
+ CustomData_get_n_offset(&em->bm->ldata, CD_MLOOPUV, uv_idx) :
+ -1,
};
make_child_duplis(ctx, &fdd, make_child_duplis_faces_from_editmesh);
}
@@ -1092,7 +1094,8 @@ static void make_duplis_faces(const DupliContext *ctx)
.mpoly = me_eval->mpoly,
.mloop = me_eval->mloop,
.mvert = me_eval->mvert,
- .mloopuv = CustomData_get_layer_n(&me_eval->ldata, CD_MLOOPUV, uv_idx),
+ .mloopuv = (uv_idx != -1) ? CustomData_get_layer_n(&me_eval->ldata, CD_MLOOPUV, uv_idx) :
+ NULL,
.orco = CustomData_get_layer(&me_eval->vdata, CD_ORCO),
};
make_child_duplis(ctx, &fdd, make_child_duplis_faces_from_mesh);
More information about the Bf-blender-cvs
mailing list