[Bf-blender-cvs] [d3b47fa8429] master: FIX T101445: halo Particles are not working.

Jason Fielder noreply at git.blender.org
Mon Oct 17 17:47:25 CEST 2022


Commit: d3b47fa84297dbbf5d5f91d0d68473468c363bd4
Author: Jason Fielder
Date:   Mon Oct 17 17:39:59 2022 +0200
Branches: master
https://developer.blender.org/rBd3b47fa84297dbbf5d5f91d0d68473468c363bd4

FIX T101445: halo Particles are not working.

color uniform assignment needing to be changed to ucolor was missed.

Ref T101445

Reviewed By: fclem

Maniphest Tasks: T101445

Differential Revision: https://developer.blender.org/D16236

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

M	source/blender/draw/engines/overlay/overlay_particle.cc

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

diff --git a/source/blender/draw/engines/overlay/overlay_particle.cc b/source/blender/draw/engines/overlay/overlay_particle.cc
index 6f77a777ba0..c9e3ccba008 100644
--- a/source/blender/draw/engines/overlay/overlay_particle.cc
+++ b/source/blender/draw/engines/overlay/overlay_particle.cc
@@ -181,14 +181,14 @@ void OVERLAY_particle_cache_populate(OVERLAY_Data *vedata, Object *ob)
         default:
         case PART_DRAW_DOT:
           grp = DRW_shgroup_create_sub(pd->particle_dots_grp);
-          DRW_shgroup_uniform_vec4_copy(grp, "color", color);
+          DRW_shgroup_uniform_vec4_copy(grp, "ucolor", color);
           DRW_shgroup_call(grp, geom, nullptr);
           break;
         case PART_DRAW_AXIS:
         case PART_DRAW_CIRC:
         case PART_DRAW_CROSS:
           grp = DRW_shgroup_create_sub(pd->particle_shapes_grp);
-          DRW_shgroup_uniform_vec4_copy(grp, "color", color);
+          DRW_shgroup_uniform_vec4_copy(grp, "ucolor", color);
           shape = DRW_cache_particles_get_prim(draw_as);
           DRW_shgroup_call_instances_with_attrs(grp, nullptr, shape, geom);
           break;



More information about the Bf-blender-cvs mailing list