[Bf-blender-cvs] [e5bc37eb5ef] blender2.8: Don't tag UBO as dirty anymore otherwise it still crashes on render

Dalai Felinto noreply at git.blender.org
Thu Jun 7 19:20:15 CEST 2018


Commit: e5bc37eb5eff9d98a9ed6861be344ee05e586173
Author: Dalai Felinto
Date:   Thu Jun 7 19:19:37 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe5bc37eb5eff9d98a9ed6861be344ee05e586173

Don't tag UBO as dirty anymore otherwise it still crashes on render

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

M	source/blender/blenkernel/intern/material.c
M	source/blender/blenkernel/intern/world.c

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

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 109b436292e..373cb4e4f06 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1315,7 +1315,4 @@ void paste_matcopybuf(Main *bmain, Material *ma)
 void BKE_material_eval(struct Depsgraph *depsgraph, Material *material)
 {
 	DEG_debug_print_eval(depsgraph, __func__, material->id.name, material);
-	if ((BLI_listbase_is_empty(&material->gpumaterial) == false)) {
-		GPU_material_uniform_buffer_tag_dirty(&material->gpumaterial);
-	}
 }
diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c
index 75965375cbd..1b06e7ed851 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -168,6 +168,5 @@ void BKE_world_eval(struct Depsgraph *depsgraph, World *world)
 	DEG_debug_print_eval(depsgraph, __func__, world->id.name, world);
 	if (!BLI_listbase_is_empty(&world->gpumaterial)) {
 		world->update_flag = 1;
-		GPU_material_uniform_buffer_tag_dirty(&world->gpumaterial);
 	}
 }



More information about the Bf-blender-cvs mailing list