From ef11113399e3273ee647b3710b346356a2b5f8f0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 6 Feb 2018 16:34:11 +1100 Subject: Object Mode: use eval_ctx mode in transform code This adds EvaluationContext into TransInfo --- source/blender/editors/transform/transform.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/transform/transform.h') diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 4ad66c0a9a5..1d67a0b3adf 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -41,6 +41,8 @@ #include "DNA_listBase.h" +#include "DEG_depsgraph.h" + /* ************************** Types ***************************** */ struct Depsgraph; @@ -465,6 +467,7 @@ typedef struct TransInfo { bool remove_on_cancel; /* remove elements if operator is canceled */ + EvaluationContext eval_ctx; void *view; struct bContext *context; /* Only valid (non null) during an operator called function. */ struct ScrArea *sa; @@ -649,7 +652,8 @@ void restoreBones(TransInfo *t); #define MANIPULATOR_AXIS_LINE_WIDTH 2.0f -bool gimbal_axis(struct Object *ob, float gmat[3][3]); /* return 0 when no gimbal for selection */ +/* return 0 when no gimbal for selection */ +bool gimbal_axis(struct Object *ob, float gmat[3][3], const short object_mode); /*********************** TransData Creation and General Handling *********** */ void createTransData(struct bContext *C, TransInfo *t); -- cgit v1.2.3 From 885d78150d092756c44519dd9fd19a4d88f02354 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 6 Feb 2018 23:27:49 +1100 Subject: Use eObjectMode for function arguments --- source/blender/editors/transform/transform.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/transform/transform.h') diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 1d67a0b3adf..b198918b698 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -68,6 +68,8 @@ struct EditBone; struct RenderEngineType; struct SnapObjectContext; +#include "DNA_object_enums.h" + /* transinfo->redraw */ typedef enum { TREDRAW_NOTHING = 0, @@ -653,7 +655,7 @@ void restoreBones(TransInfo *t); #define MANIPULATOR_AXIS_LINE_WIDTH 2.0f /* return 0 when no gimbal for selection */ -bool gimbal_axis(struct Object *ob, float gmat[3][3], const short object_mode); +bool gimbal_axis(struct Object *ob, float gmat[3][3], const eObjectMode object_mode); /*********************** TransData Creation and General Handling *********** */ void createTransData(struct bContext *C, TransInfo *t); -- cgit v1.2.3 From 1c24c04e6023f2d2a328dfcdc9f86cd381d029a3 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Apr 2018 18:20:27 +0200 Subject: Remove workspace object mode, reverts changes w/ 2.8 This caused too many problems syncing object modes with multiple objects/windows/workspaces, see: D3130 for details. --- source/blender/editors/transform/transform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/transform/transform.h') diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index b198918b698..fe05207e645 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -655,7 +655,7 @@ void restoreBones(TransInfo *t); #define MANIPULATOR_AXIS_LINE_WIDTH 2.0f /* return 0 when no gimbal for selection */ -bool gimbal_axis(struct Object *ob, float gmat[3][3], const eObjectMode object_mode); +bool gimbal_axis(struct Object *ob, float gmat[3][3]); /*********************** TransData Creation and General Handling *********** */ void createTransData(struct bContext *C, TransInfo *t); -- cgit v1.2.3