Commit: b72485e57962bdee5bcb877a013ee63ae66e5172 Author: Clément Foucault Date: Wed Jan 22 22:19:20 2020 +0100 Branches: greasepencil-refactor https://developer.blender.org/rBb72485e57962bdee5bcb877a013ee63ae66e5172
GPencil: Refactor: Fix missing material offset =================================================================== M source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl =================================================================== diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl index 72327ccaeac..9a23ff4af8d 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl @@ -182,11 +182,11 @@ uniform vec2 sizeViewportInv; /* Per Object */ uniform bool strokeOrder3d; -uniform float gpMaterialOffset; +uniform int gpMaterialOffset; uniform float thicknessScale; uniform float thicknessWorldScale; #define thicknessIsScreenSpace (thicknessWorldScale < 0.0) -#define MATERIAL(m) materials[m] +#define MATERIAL(m) materials[m + gpMaterialOffset] #ifdef GPU_VERTEX_SHADER _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
