Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-01-31 23:00:28 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-01-31 23:00:28 +0300
commitc3a41a8002e22b88c7744dfd71d7daec614671ef (patch)
tree3ac2c9837c96ca878d2182b3333a5aa705cc9c4b
parentc4f159cfcd16846941a5c8445c8ce9ec3246e900 (diff)
parentc8c9965df272835f0099260580ed8813fc8baf0d (diff)
Merge branch 'blender-v3.1-release'
-rw-r--r--source/blender/render/intern/texture_margin.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/render/intern/texture_margin.cc b/source/blender/render/intern/texture_margin.cc
index bb4b82645f0..5a9d9db5367 100644
--- a/source/blender/render/intern/texture_margin.cc
+++ b/source/blender/render/intern/texture_margin.cc
@@ -349,13 +349,17 @@ class TextureMarginMap {
* But it seems fast enough for now and that would add a lot of complexity. */
for (int i = 0; i < totloop; i++) {
int otherloop = loop_adjacency_map_[i + loopstart];
+
+ if (otherloop < 0) {
+ continue;
+ }
+
uint32_t poly = loop_to_poly_map_[otherloop];
if (lookup_pixel(x, y, poly, &destx, &desty, &foundpoly, &found_dist)) {
if (mindist < 0.f || found_dist < mindist) {
mindist = found_dist;
*r_other_poly = foundpoly;
- ;
*r_destx = destx;
*r_desty = desty;
*r_start_poly = poly;