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 <germano.costa@ig.com.br>2020-06-10 22:36:07 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-06-10 22:36:16 +0300
commit04390941050b1b790cbe812e9a8867cb56c93565 (patch)
tree26f31b8438303f5581bc902274a853eddc419742 /source/blender/editors/transform/transform_convert.c
parentbfa5eceb89cfc1d9f120c35e2206464c31630111 (diff)
Cleanup: make the sculpt convert type follow transform convention
Diffstat (limited to 'source/blender/editors/transform/transform_convert.c')
-rw-r--r--source/blender/editors/transform/transform_convert.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c
index fcca9b06451..8496642185d 100644
--- a/source/blender/editors/transform/transform_convert.c
+++ b/source/blender/editors/transform/transform_convert.c
@@ -916,6 +916,9 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
case TC_OBJECT_TEXSPACE:
special_aftertrans_update__object(C, t);
break;
+ case TC_SCULPT:
+ special_aftertrans_update__sculpt(C, t);
+ break;
case TC_SEQ_DATA:
special_aftertrans_update__sequencer(C, t);
break;
@@ -932,7 +935,6 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
case TC_MESH_UV:
case TC_PAINT_CURVE_VERTS:
case TC_PARTICLE_VERTS:
- case TC_SCULPT:
case TC_NONE:
default:
break;
@@ -1013,7 +1015,8 @@ void createTransData(bContext *C, TransInfo *t)
convert_type = TC_CURSOR_VIEW3D;
}
}
- else if ((t->options & CTX_SCULPT) && !(t->options & CTX_PAINT_CURVE)) {
+ else if (!(t->options & CTX_PAINT_CURVE) && (t->spacetype == SPACE_VIEW3D) && ob &&
+ (ob->mode == OB_MODE_SCULPT) && ob->sculpt) {
convert_type = TC_SCULPT;
}
else if (t->options & CTX_TEXTURE) {
@@ -1255,7 +1258,7 @@ void createTransData(bContext *C, TransInfo *t)
createTransParticleVerts(C, t);
break;
case TC_SCULPT:
- createTransSculpt(t);
+ createTransSculpt(C, t);
init_prop_edit = false;
break;
case TC_SEQ_DATA: