[Bf-blender-cvs] [0526088819] clay-engine: Silence warning

Dalai Felinto noreply at git.blender.org
Wed Feb 1 11:53:54 CET 2017


Commit: 05260888191228bc5461b1844c1191aac038782b
Author: Dalai Felinto
Date:   Wed Feb 1 11:46:55 2017 +0100
Branches: clay-engine
https://developer.blender.org/rB05260888191228bc5461b1844c1191aac038782b

Silence warning

There is still a warning because of `DST.context = C;` which discards
'const' qualifier. I find this a legit problem, I suspect we are not
suppose to store bContext at all.

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

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 bc927a4e96..85c8d52a6f 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -509,7 +509,7 @@ static void shgroup_dynamic_batch_instance(DRWShadingGroup *shgroup)
 	float *data = MEM_mallocN(sizeof(float) * 4 * 4 * nbr , "Instance Model Matrix");
 
 	for (DRWCall *call = shgroup->calls.first; call; call = call->next, i++) {
-		copy_m4_m4(&data[i*16], call->obmat);
+		copy_m4_m4((float (*)[4])&data[i*16], call->obmat);
 	}
 
 	/* Upload Data */




More information about the Bf-blender-cvs mailing list