[Bf-blender-cvs] [f0ada8377b9] greasepencil-object: Cleanup: Remove unused uniform

Antonio Vazquez noreply at git.blender.org
Tue Jun 27 17:01:01 CEST 2017


Commit: f0ada8377b9019b090c77cd384dad846ac0f8638
Author: Antonio Vazquez
Date:   Tue Jun 27 16:52:51 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf0ada8377b9019b090c77cd384dad846ac0f8638

Cleanup: Remove unused uniform

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

M	source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 15fa8d41a5a..912789ab958 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -258,17 +258,6 @@ static DRWShadingGroup *DRW_gpencil_shgroup_fill_create(GPENCIL_e_data *e_data,
 		DRW_shgroup_uniform_int(grp, "t_clamp", &stl->shgroups[id].t_clamp, 1);
 	}
 
-	/* object scale */
-	if ((ob) && (id > -1)) {
-		stl->shgroups[id].obj_scale = (ob->size[0] + ob->size[1] + ob->size[2]) / 3.0f;
-		DRW_shgroup_uniform_float(grp, "objscale", &stl->shgroups[id].obj_scale, 1);
-	}
-	else {
-		stl->storage->obj_scale = 1.0f;
-		DRW_shgroup_uniform_float(grp, "objscale", &stl->storage->obj_scale, 1);
-	}
-
-
 	return grp;
 }




More information about the Bf-blender-cvs mailing list