[Bf-blender-cvs] [0d686ccc529] master: GPencil: Disable G/R/S transformations in Sculpt and Weight Paint mode
Antonioya
noreply at git.blender.org
Tue Apr 16 10:04:23 CEST 2019
Commit: 0d686ccc52902428271abe66382523b0c82f7fcd
Author: Antonioya
Date: Tue Apr 16 10:04:07 2019 +0200
Branches: master
https://developer.blender.org/rB0d686ccc52902428271abe66382523b0c82f7fcd
GPencil: Disable G/R/S transformations in Sculpt and Weight Paint mode
These transformations must be only available in Object and Edit mode.
Reviewed by: @mendio @pepeland
===================================================================
M source/blender/editors/transform/transform_conversions.c
===================================================================
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index a3ee7dd5635..217dd194f57 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -8941,8 +8941,11 @@ void createTransData(bContext *C, TransInfo *t)
has_transform_context = false;
}
}
- else if (ob && (ob->mode == OB_MODE_PAINT_GPENCIL)) {
- /* In grease pencil draw mode all transformations must be canceled. */
+ else if ((ob) &&
+ (ELEM(ob->mode, OB_MODE_PAINT_GPENCIL,
+ OB_MODE_SCULPT_GPENCIL, OB_MODE_WEIGHT_GPENCIL)))
+ {
+ /* In grease pencil all transformations must be canceled if not Object or Edit. */
has_transform_context = false;
}
else {
More information about the Bf-blender-cvs
mailing list