Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <mano-wii>2022-03-11 00:33:04 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2022-03-11 00:47:38 +0300
commite3de755ae31503284277681b52947c02aef5d411 (patch)
tree481eb60ba38e1a2fe3522501e162cb599c5468f6 /source/blender/editors/transform/transform.c
parentedcb2ad7b3a07f9cd09243cc5fbf5e563e853964 (diff)
Transform/UI: individualize the option to use snap per editor type
`3DView`'s `use_snap` option has little or nothing to do with using snapping in `UV`, `Nodes` or `Sequencer`. So there are no real advantages to keeping these options in sync. Therefore, individualize the option to use snap for each "spacetype". Reviewed By: brecht Differential Revision: https://developer.blender.org/D13310
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r--source/blender/editors/transform/transform.c36
1 files changed, 32 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index bb80109d8c9..92d312cebce 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1513,14 +1513,42 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
if (t->flag & T_MODAL) {
/* do we check for parameter? */
if (transformModeUseSnap(t)) {
- if (!(t->modifiers & MOD_SNAP) != !(ts->snap_flag & SCE_SNAP)) {
+ if (!(t->modifiers & MOD_SNAP) != !(t->tsnap.flag & SCE_SNAP)) {
+ char *snap_flag_ptr;
+
+ wmMsgParams_RNA msg_key_params = {{0}};
+ RNA_pointer_create(&t->scene->id, &RNA_ToolSettings, ts, &msg_key_params.ptr);
+
+ _WM_MESSAGE_EXTERN_BEGIN;
+ extern PropertyRNA rna_ToolSettings_use_snap;
+ extern PropertyRNA rna_ToolSettings_use_snap_node;
+ extern PropertyRNA rna_ToolSettings_use_snap_sequencer;
+ extern PropertyRNA rna_ToolSettings_use_snap_uv;
+ _WM_MESSAGE_EXTERN_END;
+ if (t->spacetype == SPACE_NODE) {
+ snap_flag_ptr = &ts->snap_flag_node;
+ msg_key_params.prop = &rna_ToolSettings_use_snap_node;
+ }
+ else if (t->spacetype == SPACE_IMAGE) {
+ snap_flag_ptr = &ts->snap_uv_flag;
+ msg_key_params.prop = &rna_ToolSettings_use_snap_uv;
+ }
+ else if (t->spacetype == SPACE_SEQ) {
+ snap_flag_ptr = &ts->snap_flag_seq;
+ msg_key_params.prop = &rna_ToolSettings_use_snap_sequencer;
+ }
+ else {
+ snap_flag_ptr = &ts->snap_flag;
+ msg_key_params.prop = &rna_ToolSettings_use_snap;
+ }
+
if (t->modifiers & MOD_SNAP) {
- ts->snap_flag |= SCE_SNAP;
+ *snap_flag_ptr |= SCE_SNAP;
}
else {
- ts->snap_flag &= ~SCE_SNAP;
+ *snap_flag_ptr &= ~SCE_SNAP;
}
- WM_msg_publish_rna_prop(t->mbus, &t->scene->id, ts, ToolSettings, use_snap);
+ WM_msg_publish_rna_params(t->mbus, &msg_key_params);
}
}
}