Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2018-06-07 20:19:37 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-06-07 20:19:39 +0300
commite5bc37eb5eff9d98a9ed6861be344ee05e586173 (patch)
treee17c2b46b79e6130d78d4ade4e5131e8fdccb808 /source/blender
parentd17094b256a3a5bcd2222b9ae5650c600aa5a7d2 (diff)
Don't tag UBO as dirty anymore otherwise it still crashes on render
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/material.c3
-rw-r--r--source/blender/blenkernel/intern/world.c1
2 files changed, 0 insertions, 4 deletions
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);
}
}