diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
commit | f4140f2c8138ec07ba06376c4d0d70d40fca6fad (patch) | |
tree | b6d7d87fed15896b45b1a1cccfea1175bee0f426 /source/blender/editors/render | |
parent | 2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b (diff) | |
parent | c4046e9082f61bfef87173d20c566a065f2602d7 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_update.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index a391b13a000..42109662129 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -309,7 +309,7 @@ static void material_changed(Main *bmain, Material *ma) BKE_icon_changed(BKE_icon_id_ensure(&ma->id)); /* glsl */ - if (ma->id.tag & LIB_TAG_ID_RECALC) { + if (ma->id.recalc & ID_RECALC) { if (!BLI_listbase_is_empty(&ma->gpumaterial)) { GPU_material_free(&ma->gpumaterial); } @@ -493,7 +493,7 @@ static void world_changed(Main *UNUSED(bmain), World *wo) wo->update_flag = 1; /* glsl */ - if (wo->id.tag & LIB_TAG_ID_RECALC) { + if (wo->id.recalc & ID_RECALC) { if (!BLI_listbase_is_empty(&defmaterial.gpumaterial)) { GPU_material_free(&defmaterial.gpumaterial); } |