blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix armature drawing ignoring object matrix 

Looks like name-space collision.
This commit is contained in:
Campbell Barton 2017-04-23 04:01:54 +10:00
parent 23c4f01fb4
commit 2acb5d1e38
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/intern/draw_common.c
View File

@ -180,7 +180,7 @@ DRWShadingGroup *shgroup_instance_objspace_solid(DRWPass *pass, struct Batch *ge
DRWShadingGroup *grp = DRW_shgroup_instance_create(sh, pass, geom);
DRW_shgroup_attrib_float(grp, "InstanceModelMatrix", 16);
DRW_shgroup_attrib_float(grp, "color", 4);
DRW_shgroup_uniform_mat4(grp, "ModelMatrix", (float *)obmat);
DRW_shgroup_uniform_mat4(grp, "ObjectModelMatrix", (float *)obmat);
DRW_shgroup_uniform_vec3(grp, "light", light, 1);
return grp;

4
source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl
View File

@ -1,7 +1,7 @@
uniform mat4 ViewMatrix;
uniform mat4 ViewProjectionMatrix;
uniform mat4 ModelMatrix;
uniform mat4 ObjectModelMatrix;
/* ---- Instanciated Attribs ---- */
in vec3 pos;
@ -16,7 +16,7 @@ flat out vec4 finalColor;
void main()
{
mat4 FinalModelMatrix = ModelMatrix * InstanceModelMatrix;
mat4 FinalModelMatrix = ObjectModelMatrix * InstanceModelMatrix;
mat4 ModelViewProjectionMatrix = ViewProjectionMatrix * FinalModelMatrix;
/* This is slow and run per vertex, but it's still faster than
* doing it per instance on CPU and sending it on via instance attrib */