[Bf-blender-cvs] [42349f6efd7] blender2.8: fix compile warnings

Mike Erwin noreply at git.blender.org
Wed Apr 12 01:37:32 CEST 2017


Commit: 42349f6efd79eb8f70b6f7c5a9314d65a2c7dfe2
Author: Mike Erwin
Date:   Tue Apr 11 19:35:30 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB42349f6efd79eb8f70b6f7c5a9314d65a2c7dfe2

fix compile warnings

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

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

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

diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index a2f25f604a4..fdf99f906c6 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -582,7 +582,7 @@ void DRW_shgroup_dynamic_call_add_array(DRWShadingGroup *shgroup, const void *at
 
 	BLI_assert(attr_len == interface->attribs_count);
 
-	memcpy(call->data, attr, data_size);
+	memcpy((void *) call->data, attr, data_size);
 
 	interface->instance_count += 1;
 
@@ -1441,7 +1441,7 @@ LampEngineData *DRW_lamp_engine_data_get(Object *ob, RenderEngineType *engine_ty
 
 void DRW_lamp_engine_data_free(LampEngineData *led)
 {
-	return GPU_lamp_engine_data_free(led);
+	GPU_lamp_engine_data_free(led);
 }
 
 /* **************************************** RENDERING ************************************** */




More information about the Bf-blender-cvs mailing list