Commit: 01333cb47f83d19a62b5c96f2a69cb8a7c4ae7c3
Author: Joseph Eagar
Date: Thu Apr 21 00:58:19 2022 -0700
Branches: master
https://developer.blender.org/rB01333cb47f83d19a62b5c96f2a69cb8a7c4ae7c3
Sculpt: fix missing null pointer check
in workbench_engine.c
===================================================================
M source/blender/draw/engines/workbench/workbench_engine.c
===================================================================
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c
b/source/blender/draw/engines/workbench/workbench_engine.c
index 23543e6bfec..fb20bde2f65 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.c
+++ b/source/blender/draw/engines/workbench/workbench_engine.c
@@ -271,13 +271,17 @@ static eV3DShadingColorType
workbench_color_type_get(WORKBENCH_PrivateData *wpd,
BKE_pbvh_is_drawing_set(ob->sculpt->pbvh, is_sculpt_pbvh);
}
- const CustomData *cd_vdata = workbench_mesh_get_vert_custom_data(me);
- const CustomData *cd_ldata = workbench_mesh_get_loop_custom_data(me);
+ bool has_color = false;
- bool has_color = (CustomData_has_layer(cd_vdata, CD_PROP_COLOR) ||
- CustomData_has_layer(cd_vdata, CD_PROP_BYTE_COLOR) ||
- CustomData_has_layer(cd_ldata, CD_PROP_COLOR) ||
- CustomData_has_layer(cd_ldata, CD_PROP_BYTE_COLOR));
+ if (me) {
+ const CustomData *cd_vdata = workbench_mesh_get_vert_custom_data(me);
+ const CustomData *cd_ldata = workbench_mesh_get_loop_custom_data(me);
+
+ has_color = (CustomData_has_layer(cd_vdata, CD_PROP_COLOR) ||
+ CustomData_has_layer(cd_vdata, CD_PROP_BYTE_COLOR) ||
+ CustomData_has_layer(cd_ldata, CD_PROP_COLOR) ||
+ CustomData_has_layer(cd_ldata, CD_PROP_BYTE_COLOR));
+ }
if (color_type == V3D_SHADING_TEXTURE_COLOR) {
if (ob->dt < OB_TEXTURE) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
