[Bf-blender-cvs] [694bc977686] blender2.8: Draw Manager: Prevent errors when overwritting the instance batch.
Clément Foucault
noreply at git.blender.org
Tue May 23 13:51:16 CEST 2017
Commit: 694bc9776860fb0c8e5e95a3ca81a0badf72ced0
Author: Clément Foucault
Date: Tue May 23 10:38:52 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB694bc9776860fb0c8e5e95a3ca81a0badf72ced0
Draw Manager: Prevent errors when overwritting the instance batch.
===================================================================
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 94e32424ade..a652b9b9426 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -825,6 +825,7 @@ void DRW_shgroup_free(struct DRWShadingGroup *shgroup)
void DRW_shgroup_instance_batch(DRWShadingGroup *shgroup, struct Batch *instances)
{
BLI_assert(shgroup->type == DRW_SHG_INSTANCE);
+ BLI_assert(shgroup->interface->instance_batch == NULL);
shgroup->interface->instance_batch = instances;
}
More information about the Bf-blender-cvs
mailing list