[Bf-blender-cvs] [8e1b16534d4] master: Fix: Incorrect implicit enum conversion

Hans Goudey noreply at git.blender.org
Mon Apr 25 21:48:20 CEST 2022


Commit: 8e1b16534d4061abbfa06ef24c0ded26eca42c54
Author: Hans Goudey
Date:   Mon Apr 25 14:48:14 2022 -0500
Branches: master
https://developer.blender.org/rB8e1b16534d4061abbfa06ef24c0ded26eca42c54

Fix: Incorrect implicit enum conversion

Hardcode Catmull Rom curves for now, since nothing else is implemented.

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

M	source/blender/draw/intern/draw_shader.c

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

diff --git a/source/blender/draw/intern/draw_shader.c b/source/blender/draw/intern/draw_shader.c
index 487a09d313d..ba348d10c83 100644
--- a/source/blender/draw/intern/draw_shader.c
+++ b/source/blender/draw/intern/draw_shader.c
@@ -99,13 +99,13 @@ GPUShader *DRW_shader_curves_refine_get(CurvesEvalShader type, eParticleRefineSh
     GPUShader *sh = NULL;
     switch (sh_type) {
       case PART_REFINE_SHADER_COMPUTE:
-        sh = hair_refine_shader_compute_create(type);
+        sh = hair_refine_shader_compute_create(PART_REFINE_CATMULL_ROM);
         break;
       case PART_REFINE_SHADER_TRANSFORM_FEEDBACK:
-        sh = hair_refine_shader_transform_feedback_create(type);
+        sh = hair_refine_shader_transform_feedback_create(PART_REFINE_CATMULL_ROM);
         break;
       case PART_REFINE_SHADER_TRANSFORM_FEEDBACK_WORKAROUND:
-        sh = hair_refine_shader_transform_feedback_workaround_create(type);
+        sh = hair_refine_shader_transform_feedback_workaround_create(PART_REFINE_CATMULL_ROM);
         break;
       default:
         BLI_assert_msg(0, "Incorrect shader type");



More information about the Bf-blender-cvs mailing list