[Bf-blender-cvs] [a327d98d3c1] temp-T96709-painting-target: WIP. switching machines for proper GPU debugging session.
Jeroen Bakker
noreply at git.blender.org
Tue Apr 5 11:33:07 CEST 2022
Commit: a327d98d3c1358e5efcf2575ef140466c7164d2c
Author: Jeroen Bakker
Date: Tue Apr 5 11:32:24 2022 +0200
Branches: temp-T96709-painting-target
https://developer.blender.org/rBa327d98d3c1358e5efcf2575ef140466c7164d2c
WIP. switching machines for proper GPU debugging session.
Workbench draws in material mode, but screen is still showing vertex mode.
===================================================================
M source/blender/blenkernel/intern/pbvh.c
M source/blender/editors/sculpt_paint/paint_canvas.cc
M source/blender/editors/space_view3d/space_view3d.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 38c9629f6e1..d8b2b341327 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -1727,7 +1727,7 @@ BMesh *BKE_pbvh_get_bmesh(PBVH *pbvh)
void BKE_pbvh_mark_update_color(PBVH *pbvh)
{
for (int n = 0; n < pbvh->totnode; n++) {
- BKE_pbvh_node_mark_update_color(&pbvh->nodes[n]);
+ BKE_pbvh_node_mark_rebuild_draw(&pbvh->nodes[n]);
}
}
diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc
index 1f0d385dbb2..f82bb0e642a 100644
--- a/source/blender/editors/sculpt_paint/paint_canvas.cc
+++ b/source/blender/editors/sculpt_paint/paint_canvas.cc
@@ -117,6 +117,7 @@ eV3DShadingColorType ED_paint_shading_color_override(bContext *C,
Object *ob,
eV3DShadingColorType orig_color_type)
{
+ printf("%s %d\n", __func__, orig_color_type);
/* NOTE: This early exit is temporarily, until a paint mode has been added.
* For better integration with the vertex paint in sculpt mode we sticky
* with the last stoke when using tools like masking.
@@ -159,6 +160,7 @@ eV3DShadingColorType ED_paint_shading_color_override(bContext *C,
if (!U.experimental.use_sculpt_texture_paint && color_type == V3D_SHADING_TEXTURE_COLOR) {
return orig_color_type;
}
+ printf("%s %d->%d\n", __func__, orig_color_type, color_type);
return color_type;
}
@@ -231,5 +233,6 @@ void ED_paint_do_msg_notify_active_tool_changed(struct bContext *C,
}
PBVH *pbvh = ob->sculpt->pbvh;
BKE_pbvh_mark_update_color(pbvh);
+ printf("%s\n", __func__);
}
}
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index e5e123c066d..9a9c60625f8 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -1384,6 +1384,7 @@ static void view3d_main_region_message_subscribe(const wmRegionMessageSubscribeP
case OB_MODE_SCULPT:
WM_msg_subscribe_rna_anon_prop(mbus, WorkSpace, tools, &msg_sub_value_pbvh_refresh);
+ WM_msg_subscribe_rna_anon_prop(mbus, WorkSpace, tools, &msg_sub_value_region_tag_redraw);
break;
default:
break;
More information about the Bf-blender-cvs
mailing list