[Bf-blender-cvs] [f88022b96f3] master: Cleanup: make transform data in object mode flag public
Campbell Barton
noreply at git.blender.org
Wed Aug 28 05:45:06 CEST 2019
Commit: f88022b96f3a0522b6a2e3a7f441f43ec7becff9
Author: Campbell Barton
Date: Wed Aug 28 13:42:22 2019 +1000
Branches: master
https://developer.blender.org/rBf88022b96f3a0522b6a2e3a7f441f43ec7becff9
Cleanup: make transform data in object mode flag public
This fits better with intended flag usage.
===================================================================
M source/blender/editors/include/ED_transform.h
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_snap.c
===================================================================
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index 192af8f5273..a8a8b8936e0 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -90,6 +90,8 @@ enum TfmMode {
#define CTX_PAINT_CURVE (1 << 8)
#define CTX_GPENCIL_STROKES (1 << 9)
#define CTX_CURSOR (1 << 10)
+/** When transforming object's, adjust the object data so it stays in the same place. */
+#define CTX_OBMODE_XFORM_OBDATA (1 << 11)
/* Standalone call to get the transformation center corresponding to the current situation
* returns 1 if successful, 0 otherwise (usually means there's no selection)
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 358e4825278..9782b694bb0 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -802,10 +802,6 @@ enum {
T_MODAL_CURSOR_SET = 1 << 26,
T_CLNOR_REBUILD = 1 << 27,
-
- /** When transforming object's, adjust the object data so it stays in the same place. */
- T_OBJECT_DATA_IN_OBJECT_MODE = 1 << 28,
-
};
/** #TransInfo.modifiers */
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 66038a78220..567faa2f7a4 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -6539,7 +6539,7 @@ static void flush_trans_object_base_deps_flag(Depsgraph *depsgraph, Object *obje
static void trans_object_base_deps_flag_finish(const TransInfo *t, ViewLayer *view_layer)
{
- if ((t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) == 0) {
+ if ((t->options & CTX_OBMODE_XFORM_OBDATA) == 0) {
for (Base *base = view_layer->object_bases.first; base; base = base->next) {
if (base->object->id.tag & LIB_TAG_DOIT) {
base->flag_legacy |= BA_SNAP_FIX_DEPS_FIASCO;
@@ -7811,7 +7811,7 @@ static void createTransObject(bContext *C, TransInfo *t)
td->flag |= TD_SKIP;
}
- if (t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) {
+ if (t->options & CTX_OBMODE_XFORM_OBDATA) {
ID *id = ob->data;
if (!id || id->lib) {
td->flag |= TD_SKIP;
@@ -7823,7 +7823,7 @@ static void createTransObject(bContext *C, TransInfo *t)
}
}
- if (t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) {
+ if (t->options & CTX_OBMODE_XFORM_OBDATA) {
if ((td->flag & TD_SKIP) == 0) {
trans_obdata_in_obmode_ensure_object(t, ob);
}
@@ -7861,7 +7861,7 @@ static void createTransObject(bContext *C, TransInfo *t)
}
}
- if (t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) {
+ if (t->options & CTX_OBMODE_XFORM_OBDATA) {
GSet *objects_in_transdata = BLI_gset_ptr_new_ex(__func__, tc->data_len);
td = tc->data;
for (int i = 0; i < tc->data_len; i++, td++) {
@@ -9888,7 +9888,7 @@ void createTransData(bContext *C, TransInfo *t)
BKE_scene_graph_evaluated_ensure(t->depsgraph, CTX_data_main(t->context));
if ((scene->toolsettings->transform_flag & SCE_XFORM_DATA_ORIGIN) != 0) {
- t->flag |= T_OBJECT_DATA_IN_OBJECT_MODE;
+ t->options |= CTX_OBMODE_XFORM_OBDATA;
}
createTransObject(C, t);
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 41eb5f1e812..bec8260041f 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1151,7 +1151,7 @@ static void recalcData_objects(TransInfo *t)
ED_objects_recalculate_paths(t->context, t->scene, true);
}
- if (t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) {
+ if (t->options & CTX_OBMODE_XFORM_OBDATA) {
trans_obdata_in_obmode_update_all(t);
}
}
@@ -1923,7 +1923,7 @@ void postTrans(bContext *C, TransInfo *t)
BLI_rng_free(t->rng);
}
- if (t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) {
+ if (t->options & CTX_OBMODE_XFORM_OBDATA) {
trans_obdata_in_obmode_free_all(t);
}
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 14242f6ba40..571ce7a6bc2 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -633,14 +633,12 @@ static void initSnappingMode(TransInfo *t)
(obedit_type == -1)) // Object Mode
{
- if (t->options & (CTX_GPENCIL_STROKES | CTX_CURSOR)) {
+ if (t->options & (CTX_GPENCIL_STROKES | CTX_CURSOR | CTX_OBMODE_XFORM_OBDATA)) {
/* In "Edit Strokes" mode,
* snap tool can perform snap to selected or active objects (see T49632)
- * TODO: perform self snap in gpencil_strokes */
- t->tsnap.modeSelect = SNAP_ALL;
- }
- else if (t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) {
- /* When we're moving the origins, allow snapping onto our own geometry (see T69132). */
+ * TODO: perform self snap in gpencil_strokes.
+ *
+ * When we're moving the origins, allow snapping onto our own geometry (see T69132). */
t->tsnap.modeSelect = SNAP_ALL;
}
else {
@@ -1251,7 +1249,7 @@ static void TargetSnapClosest(TransInfo *t)
for (td = tc->data, i = 0; i < tc->data_len && td->flag & TD_SELECTED; i++, td++) {
const BoundBox *bb = NULL;
- if ((t->flag & T_OBJECT_DATA_IN_OBJECT_MODE) == 0) {
+ if ((t->options & CTX_OBMODE_XFORM_OBDATA) == 0) {
bb = BKE_object_boundbox_get(td->ob);
}
More information about the Bf-blender-cvs
mailing list