[Bf-blender-cvs] [3eb658e7f25] hair_guides_grooming: Fix stupid copy/paste error, was using the same parent index when interpolating.
Lukas Tönne
noreply at git.blender.org
Wed Jun 13 20:30:36 CEST 2018
Commit: 3eb658e7f25d0a1fd50f72a7c1b61e6e27f3f2a6
Author: Lukas Tönne
Date: Wed Jun 13 19:30:08 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB3eb658e7f25d0a1fd50f72a7c1b61e6e27f3f2a6
Fix stupid copy/paste error, was using the same parent index when interpolating.
===================================================================
M source/blender/draw/modes/shaders/common_hair_guides_lib.glsl
===================================================================
diff --git a/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl b/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl
index 1d9060f6004..67399698e53 100644
--- a/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl
+++ b/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl
@@ -268,21 +268,21 @@ void interpolate_vertex(int fiber_index, float curve_param,
if (parent_index.y != INDEX_INVALID) {
vec3 pco, pnor, ptang, prootco;
DeformParams pdeform_params;
- interpolate_parent_curve(parent_index.x, curve_param, pco, pnor, ptang, prootco, pdeform_params);
+ interpolate_parent_curve(parent_index.y, curve_param, pco, pnor, ptang, prootco, pdeform_params);
co += parent_weight.y * pco;
tang += parent_weight.y * normalize(ptang);
}
if (parent_index.z != INDEX_INVALID) {
vec3 pco, pnor, ptang, prootco;
DeformParams pdeform_params;
- interpolate_parent_curve(parent_index.x, curve_param, pco, pnor, ptang, prootco, pdeform_params);
+ interpolate_parent_curve(parent_index.z, curve_param, pco, pnor, ptang, prootco, pdeform_params);
co += parent_weight.z * pco;
tang += parent_weight.z * normalize(ptang);
}
if (parent_index.w != INDEX_INVALID) {
vec3 pco, pnor, ptang, prootco;
DeformParams pdeform_params;
- interpolate_parent_curve(parent_index.x, curve_param, pco, pnor, ptang, prootco, pdeform_params);
+ interpolate_parent_curve(parent_index.w, curve_param, pco, pnor, ptang, prootco, pdeform_params);
co += parent_weight.w * pco;
tang += parent_weight.w * normalize(ptang);
}
More information about the Bf-blender-cvs
mailing list