[Bf-blender-cvs] [1ffbe1ad974] temp-T97479-3d-texturing-undo: Updated incorrect comments.
Jeroen Bakker
noreply at git.blender.org
Tue May 3 12:57:02 CEST 2022
Commit: 1ffbe1ad974d5fd057957eb32dfecc388e3c37c6
Author: Jeroen Bakker
Date: Tue May 3 12:48:01 2022 +0200
Branches: temp-T97479-3d-texturing-undo
https://developer.blender.org/rB1ffbe1ad974d5fd057957eb32dfecc388e3c37c6
Updated incorrect comments.
===================================================================
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_paint_image.cc
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index b62b506b285..8f3d72504a2 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -5296,8 +5296,8 @@ static bool sculpt_stroke_test_start(bContext *C, struct wmOperator *op, const f
SculptCursorGeometryInfo sgi;
SCULPT_cursor_geometry_info_update(C, &sgi, mouse, false);
- /* This is incorrect as this crashes other areas. We should integrate the image undo into the
- * sculpt undo. (sub system?). */
+ /* Setup the correct undo system. Image painting and sculpting are mutual exclusive.
+ * Color attributes are part of the sculpting undy system. */
if (SCULPT_use_image_paint_brush(&tool_settings->paint_mode, ob)) {
ED_image_undo_push_begin(op->type->name, PAINT_MODE_SCULPT);
}
diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
index af511e24544..b0c33a65bc9 100644
--- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
@@ -393,8 +393,6 @@ static void push_undo(const NodeData &node_data,
&tiley,
&tilew,
&tileh);
- /* For performance reasons we could move this to the caller now it reallocates it per node
- * per tile. */
for (int ty = tiley; ty <= tileh; ty++) {
for (int tx = tilex; tx <= tilew; tx++) {
ED_image_paint_tile_push(undo_tiles,
More information about the Bf-blender-cvs
mailing list