Commit: 0de6f16a25b77e296934d83af30f94f57c441e48
Author: Joseph Eagar
Date: Thu Jan 13 16:51:52 2022 -0800
Branches: sculpt-dev
https://developer.blender.org/rB0de6f16a25b77e296934d83af30f94f57c441e48
Commit prior to merge
===================================================================
M release/datafiles/icons/brush.gpencil_draw.draw.dat
M release/datafiles/icons/brush.gpencil_draw.fill.dat
M release/datafiles/icons/brush.paint_texture.clone.dat
M release/datafiles/icons/brush.paint_texture.draw.dat
M release/datafiles/icons/brush.paint_texture.fill.dat
M release/datafiles/icons/brush.paint_texture.mask.dat
M release/datafiles/icons/brush.paint_texture.smear.dat
M release/datafiles/icons/brush.paint_texture.soften.dat
M release/datafiles/icons/brush.paint_vertex.average.dat
M release/datafiles/icons/brush.paint_vertex.blur.dat
M release/datafiles/icons/brush.paint_vertex.draw.dat
M release/datafiles/icons/brush.paint_vertex.smear.dat
M release/datafiles/icons/brush.paint_weight.average.dat
M release/datafiles/icons/brush.paint_weight.blur.dat
M release/datafiles/icons/brush.paint_weight.draw.dat
M release/datafiles/icons/brush.paint_weight.smear.dat
M release/datafiles/icons/brush.sculpt.paint.dat
M release/datafiles/icons/brush.sculpt.smear.dat
M release/datafiles/icons/ops.paint.weight_fill.dat
M release/datafiles/icons/ops.paint.weight_sample.dat
M release/datafiles/icons/ops.paint.weight_sample_group.dat
M release/datafiles/icons/ops.sculpt.color_filter.dat
M release/datafiles/icons/ops.sculpt.mask_by_color.dat
M source/blender/draw/intern/draw_cache_impl_mesh.c
===================================================================
diff --git a/release/datafiles/icons/brush.gpencil_draw.draw.dat
b/release/datafiles/icons/brush.gpencil_draw.draw.dat
index 2bfbae27ba6..b97225ea2ec 100644
Binary files a/release/datafiles/icons/brush.gpencil_draw.draw.dat and
b/release/datafiles/icons/brush.gpencil_draw.draw.dat differ
diff --git a/release/datafiles/icons/brush.gpencil_draw.fill.dat
b/release/datafiles/icons/brush.gpencil_draw.fill.dat
index 869e65b2fbf..46024abc0ee 100644
Binary files a/release/datafiles/icons/brush.gpencil_draw.fill.dat and
b/release/datafiles/icons/brush.gpencil_draw.fill.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.clone.dat
b/release/datafiles/icons/brush.paint_texture.clone.dat
index 5d94ab45ada..a206a555053 100644
Binary files a/release/datafiles/icons/brush.paint_texture.clone.dat and
b/release/datafiles/icons/brush.paint_texture.clone.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.draw.dat
b/release/datafiles/icons/brush.paint_texture.draw.dat
index 678a9ea26e5..6d59f3f773b 100644
Binary files a/release/datafiles/icons/brush.paint_texture.draw.dat and
b/release/datafiles/icons/brush.paint_texture.draw.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.fill.dat
b/release/datafiles/icons/brush.paint_texture.fill.dat
index 869e65b2fbf..46024abc0ee 100644
Binary files a/release/datafiles/icons/brush.paint_texture.fill.dat and
b/release/datafiles/icons/brush.paint_texture.fill.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.mask.dat
b/release/datafiles/icons/brush.paint_texture.mask.dat
index cea902261fa..afb790c7160 100644
Binary files a/release/datafiles/icons/brush.paint_texture.mask.dat and
b/release/datafiles/icons/brush.paint_texture.mask.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.smear.dat
b/release/datafiles/icons/brush.paint_texture.smear.dat
index 694655477db..d7b4da3d580 100644
Binary files a/release/datafiles/icons/brush.paint_texture.smear.dat and
b/release/datafiles/icons/brush.paint_texture.smear.dat differ
diff --git a/release/datafiles/icons/brush.paint_texture.soften.dat
b/release/datafiles/icons/brush.paint_texture.soften.dat
index 2128de71dff..696437134b2 100644
Binary files a/release/datafiles/icons/brush.paint_texture.soften.dat and
b/release/datafiles/icons/brush.paint_texture.soften.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.average.dat
b/release/datafiles/icons/brush.paint_vertex.average.dat
index f082d7ed114..62d0ad95170 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.average.dat and
b/release/datafiles/icons/brush.paint_vertex.average.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.blur.dat
b/release/datafiles/icons/brush.paint_vertex.blur.dat
index 2128de71dff..696437134b2 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.blur.dat and
b/release/datafiles/icons/brush.paint_vertex.blur.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.draw.dat
b/release/datafiles/icons/brush.paint_vertex.draw.dat
index 74e00d243d6..c949f630a76 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.draw.dat and
b/release/datafiles/icons/brush.paint_vertex.draw.dat differ
diff --git a/release/datafiles/icons/brush.paint_vertex.smear.dat
b/release/datafiles/icons/brush.paint_vertex.smear.dat
index 694655477db..d7b4da3d580 100644
Binary files a/release/datafiles/icons/brush.paint_vertex.smear.dat and
b/release/datafiles/icons/brush.paint_vertex.smear.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.average.dat
b/release/datafiles/icons/brush.paint_weight.average.dat
index f082d7ed114..62d0ad95170 100644
Binary files a/release/datafiles/icons/brush.paint_weight.average.dat and
b/release/datafiles/icons/brush.paint_weight.average.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.blur.dat
b/release/datafiles/icons/brush.paint_weight.blur.dat
index 2128de71dff..696437134b2 100644
Binary files a/release/datafiles/icons/brush.paint_weight.blur.dat and
b/release/datafiles/icons/brush.paint_weight.blur.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.draw.dat
b/release/datafiles/icons/brush.paint_weight.draw.dat
index a2641927371..e05437a9a15 100644
Binary files a/release/datafiles/icons/brush.paint_weight.draw.dat and
b/release/datafiles/icons/brush.paint_weight.draw.dat differ
diff --git a/release/datafiles/icons/brush.paint_weight.smear.dat
b/release/datafiles/icons/brush.paint_weight.smear.dat
index 36958641266..399668b4aa7 100644
Binary files a/release/datafiles/icons/brush.paint_weight.smear.dat and
b/release/datafiles/icons/brush.paint_weight.smear.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.paint.dat
b/release/datafiles/icons/brush.sculpt.paint.dat
index 0ec7c7c7052..1cee34c0dee 100644
Binary files a/release/datafiles/icons/brush.sculpt.paint.dat and
b/release/datafiles/icons/brush.sculpt.paint.dat differ
diff --git a/release/datafiles/icons/brush.sculpt.smear.dat
b/release/datafiles/icons/brush.sculpt.smear.dat
index c7214fb863b..3efba0b4cb1 100644
Binary files a/release/datafiles/icons/brush.sculpt.smear.dat and
b/release/datafiles/icons/brush.sculpt.smear.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_fill.dat
b/release/datafiles/icons/ops.paint.weight_fill.dat
index 869e65b2fbf..46024abc0ee 100644
Binary files a/release/datafiles/icons/ops.paint.weight_fill.dat and
b/release/datafiles/icons/ops.paint.weight_fill.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_sample.dat
b/release/datafiles/icons/ops.paint.weight_sample.dat
index a428ae67e4c..4d33ebb5914 100644
Binary files a/release/datafiles/icons/ops.paint.weight_sample.dat and
b/release/datafiles/icons/ops.paint.weight_sample.dat differ
diff --git a/release/datafiles/icons/ops.paint.weight_sample_group.dat
b/release/datafiles/icons/ops.paint.weight_sample_group.dat
index 863496f8908..17c33237efc 100644
Binary files a/release/datafiles/icons/ops.paint.weight_sample_group.dat and
b/release/datafiles/icons/ops.paint.weight_sample_group.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.color_filter.dat
b/release/datafiles/icons/ops.sculpt.color_filter.dat
index 9c8fb3c0e92..d589b15a124 100644
Binary files a/release/datafiles/icons/ops.sculpt.color_filter.dat and
b/release/datafiles/icons/ops.sculpt.color_filter.dat differ
diff --git a/release/datafiles/icons/ops.sculpt.mask_by_color.dat
b/release/datafiles/icons/ops.sculpt.mask_by_color.dat
index e22b1270a79..637c47d2d84 100644
Binary files a/release/datafiles/icons/ops.sculpt.mask_by_color.dat and
b/release/datafiles/icons/ops.sculpt.mask_by_color.dat differ
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c
b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 8bde4e081d6..c74a6a33dd6 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1675,7 +1675,7 @@ void DRW_mesh_batch_cache_create_requested(struct
TaskGraph *task_graph,
bool cd_uv_update = false;
/* Early out */
- if (cache->batch_requested == 0) {
+ if (!cache || cache->batch_requested == 0) {
#ifdef DEBUG
drw_mesh_batch_cache_check_available(task_graph, me);
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
