[Bf-blender-cvs] [79fd8eeb0e0] blender2.8: missing from last commit

Campbell Barton noreply at git.blender.org
Sat Apr 22 20:03:42 CEST 2017


Commit: 79fd8eeb0e0dc10a9ca6825699d460c700d2aa3d
Author: Campbell Barton
Date:   Sun Apr 23 04:06:45 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB79fd8eeb0e0dc10a9ca6825699d460c700d2aa3d

missing from last commit

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

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

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

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index 58e6c6c68fb..e50d21e0eb0 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -193,7 +193,7 @@ DRWShadingGroup *shgroup_instance_objspace_wire(DRWPass *pass, struct Batch *geo
 	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);
 
 	return grp;
 }




More information about the Bf-blender-cvs mailing list