[Bf-blender-cvs] [c115021f8bb] blender2.8: Cleanup: unused vars

Campbell Barton noreply at git.blender.org
Wed Apr 25 12:00:06 CEST 2018


Commit: c115021f8bbfad3d5d1e9a65c4a6d6f8f7493660
Author: Campbell Barton
Date:   Wed Apr 25 11:59:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc115021f8bbfad3d5d1e9a65c4a6d6f8f7493660

Cleanup: unused vars

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

M	source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
M	source/blender/draw/engines/workbench/shaders/workbench_object_overlap_lib.glsl
M	source/blender/draw/modes/overlay_mode.c

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

diff --git a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
index 77729733fd7..ef0dd8519e7 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_composite_frag.glsl
@@ -28,7 +28,7 @@ void main()
 #else /* !V3D_DRAWOPTION_OBJECT_OVERLAP */
 	uint object_id = depth == 1.0? NO_OBJECT_ID: texelFetch(objectId, texel, 0).r;
 	float object_overlap = calculate_object_overlap(objectId, texel, object_id);
-	
+
 	if (object_id == NO_OBJECT_ID) {
 		vec3 background = background_color(world_data, uv_viewport.y);
 		if (object_overlap == 0.0) {
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_object_overlap_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_object_overlap_lib.glsl
index f4c7c896d17..e961f50b5f2 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_object_overlap_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_object_overlap_lib.glsl
@@ -10,4 +10,4 @@ float calculate_object_overlap(usampler2D objectId, ivec2 texel, uint object_id)
 	    texelFetchOffset(objectId, texel, 0, ivec2( OBJECT_OVERLAP_OFFSET, 0)).r);
 
 	return dot(vec4(equal(uvec4(object_id), oid_offset)), vec4(1.0/4.0));
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index 01ed0656a65..b9de9749658 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -68,7 +68,7 @@ static void overlay_engine_init(void *vedata)
 {
 	OVERLAY_Data * data = (OVERLAY_Data *)vedata;
 	OVERLAY_StorageList *stl = data->stl;
-	DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
+	// DefaultTextureList *dtxl = DRW_viewport_texture_list_get();
 
 	if (!stl->g_data) {
 		/* Alloc transient pointers */
@@ -89,8 +89,6 @@ static void overlay_cache_init(void *vedata)
 	OVERLAY_StorageList *stl = data->stl;
 
 	const DRWContextState *DCS = DRW_context_state_get();
-	DRWShadingGroup *grp;
-
 
 	View3D *v3d = DCS->v3d;
 	if (v3d) {
@@ -111,7 +109,7 @@ static void overlay_cache_init(void *vedata)
 static void overlay_cache_populate(void *vedata, Object *ob)
 {
 	OVERLAY_Data * data = (OVERLAY_Data *)vedata;
-	OVERLAY_PassList *psl = data->psl;
+	// OVERLAY_PassList *psl = data->psl;
 	OVERLAY_StorageList *stl = data->stl;
 	OVERLAY_PrivateData *pd = stl->g_data;



More information about the Bf-blender-cvs mailing list