blender
/
blender
137
411
Fork 595
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

Sculpt: Disable set pivot and select color for invisible objects #118306

Merged
Raul Fernandez Hernandez merged 1 commits from Sean-Kim/blender:112371-sculpt-menu-invisible into blender-v4.1-release 2024-02-15 16:30:40 +01:00
Conversation 0 Commits 1 Files Changed 2 +13
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/sculpt_paint/sculpt_ops.cc
View File

@ -640,6 +640,12 @@ static int sculpt_sample_color_invoke(bContext *C, wmOperator *op, const wmEvent
return OPERATOR_CANCELLED;
}
const View3D *v3d = CTX_wm_view3d(C);
const Base *base = CTX_data_active_base(C);
if (!BKE_base_is_visible(v3d, base)) {
return OPERATOR_CANCELLED;
}
BKE_sculpt_update_object_for_edit(CTX_data_depsgraph_pointer(C), ob, false);
/* No color attribute? Set color to white. */

7
source/blender/editors/sculpt_paint/sculpt_transform.cc
View File

@ -16,6 +16,7 @@
#include "BKE_brush.hh"
#include "BKE_context.hh"
#include "BKE_kelvinlet.h"
#include "BKE_layer.hh"
#include "BKE_paint.hh"
#include "BKE_pbvh_api.hh"
@ -387,6 +388,12 @@ static int sculpt_set_pivot_position_exec(bContext *C, wmOperator *op)
int mode = RNA_enum_get(op->ptr, "mode");
const View3D *v3d = CTX_wm_view3d(C);
const Base *base = CTX_data_active_base(C);
if (!BKE_base_is_visible(v3d, base)) {
return OPERATOR_CANCELLED;
}
BKE_sculpt_update_object_for_edit(depsgraph, ob, false);
/* Pivot to center. */