[Bf-blender-cvs] [453724894ea] master: Fix T103704: Particle hair doesn't fall back to active UV

Hans Goudey noreply at git.blender.org
Fri Jan 20 22:34:33 CET 2023


Commit: 453724894ea5c0f02ffd90ff3a9508477259e73b
Author: Hans Goudey
Date:   Fri Jan 20 15:34:13 2023 -0600
Branches: master
https://developer.blender.org/rB453724894ea5c0f02ffd90ff3a9508477259e73b

Fix T103704: Particle hair doesn't fall back to active UV

Caused by 05952aa94d33eeb504fa, which removed the use of the
active tessface UV pointer on meshes but didn't replace it properly with
the equivalend custom data API function.

===================================================================

M	source/blender/blenkernel/intern/particle.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc
index 99dfd7fe138..514accf098b 100644
--- a/source/blender/blenkernel/intern/particle.cc
+++ b/source/blender/blenkernel/intern/particle.cc
@@ -4216,7 +4216,9 @@ static int get_particle_uv(Mesh *mesh,
   int i;
 
   tf = static_cast<const MTFace *>(CustomData_get_layer_named(&mesh->fdata, CD_MTFACE, name));
-
+  if (tf == nullptr) {
+    tf = static_cast<const MTFace *>(CustomData_get_layer(&mesh->fdata, CD_MTFACE));
+  }
   if (tf == nullptr) {
     return 0;
   }



More information about the Bf-blender-cvs mailing list