diff options
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_pixels.cc | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_pixels_seams.cc | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_image.cc | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc index 7dcc79b9eff..e0c67601d33 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels.cc +++ b/source/blender/blenkernel/intern/pbvh_pixels.cc @@ -317,7 +317,7 @@ static void apply_watertight_check(PBVH *pbvh, Image *image, ImageUser *image_us LISTBASE_FOREACH (ImageTile *, tile_data, &image->tiles) { image::ImageTileWrapper image_tile(tile_data); watertight.tile = image_tile.get_tile_number(); - ImBuf *image_buffer = BKE_image_acquire_ibuf(image, &watertight, NULL); + ImBuf *image_buffer = BKE_image_acquire_ibuf(image, &watertight, nullptr); if (image_buffer == nullptr) { continue; } @@ -353,7 +353,7 @@ static void apply_watertight_check(PBVH *pbvh, Image *image, ImageUser *image_us } } } - BKE_image_release_ibuf(image, image_buffer, NULL); + BKE_image_release_ibuf(image, image_buffer, nullptr); } BKE_image_partial_update_mark_full_update(image); } diff --git a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc index 18deb632f2a..e55f5cff59e 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels_seams.cc +++ b/source/blender/blenkernel/intern/pbvh_pixels_seams.cc @@ -298,14 +298,14 @@ void BKE_pbvh_pixels_fix_seams(PBVH &pbvh, ImageTileWrapper image_tile(tile_data); local_image_user.tile = image_tile.get_tile_number(); - ImBuf *image_buffer = BKE_image_acquire_ibuf(&image, &local_image_user, NULL); + ImBuf *image_buffer = BKE_image_acquire_ibuf(&image, &local_image_user, nullptr); if (image_buffer == nullptr) { continue; } context.image_buffer = image_buffer; UVSeamExtender extender(context, image_tile); extender.extend_x(); - BKE_image_release_ibuf(&image, image_buffer, NULL); + BKE_image_release_ibuf(&image, image_buffer, nullptr); } } diff --git a/source/blender/editors/sculpt_paint/sculpt_image.cc b/source/blender/editors/sculpt_paint/sculpt_image.cc index fb65b5d2196..395d26f0bf0 100644 --- a/source/blender/editors/sculpt_paint/sculpt_image.cc +++ b/source/blender/editors/sculpt_paint/sculpt_image.cc @@ -33,11 +33,9 @@ void ED_sculpt_pbvh_message_subscribe(const wmRegionMessageSubscribeParams *para { struct wmMsgBus *mbus = params->message_bus; - wmMsgSubscribeValue notify_msg = { - .owner = NULL, - .user_data = NULL, - .notify = sculpt_pbvh_do_msg_tag_rebuild_pixels, - }; + wmMsgSubscribeValue notify_msg = {nullptr}; + notify_msg.notify = sculpt_pbvh_do_msg_tag_rebuild_pixels; + WM_msg_subscribe_rna_anon_prop(mbus, Object, active_material_index, ¬ify_msg); WM_msg_subscribe_rna_anon_prop(mbus, MeshUVLoopLayer, active, ¬ify_msg); WM_msg_subscribe_rna_anon_type(mbus, Image, ¬ify_msg); |