[Bf-blender-cvs] [3ba5461af0c] blender-v2.82-release: Object: support 'Affect Parents' for snap/clear transform
Campbell Barton
noreply at git.blender.org
Sat Feb 1 03:39:56 CET 2020
Commit: 3ba5461af0c8b1273d3daf87d050c24a690273be
Author: Campbell Barton
Date: Sat Feb 1 13:34:27 2020 +1100
Branches: blender-v2.82-release
https://developer.blender.org/rB3ba5461af0c8b1273d3daf87d050c24a690273be
Object: support 'Affect Parents' for snap/clear transform
Resolves T69450
===================================================================
M source/blender/editors/include/ED_object.h
M source/blender/editors/object/object_data_transform.c
M source/blender/editors/object/object_transform.c
M source/blender/editors/object/object_utils.c
M source/blender/editors/space_view3d/view3d_snap.c
M source/blender/editors/transform/transform_convert_object.c
===================================================================
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index d27eeb270ac..a3b7d6bd1c1 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -73,6 +73,51 @@ bool ED_object_calc_active_center_for_posemode(struct Object *ob,
float r_center[3]);
bool ED_object_calc_active_center(struct Object *ob, const bool select_only, float r_center[3]);
+/* Object Data Container helper API. */
+struct XFormObjectData_Container;
+struct XFormObjectData_Container *ED_object_data_xform_container_create(void);
+void ED_object_data_xform_container_destroy(struct XFormObjectData_Container *xds);
+void ED_object_data_xform_container_update_all(struct XFormObjectData_Container *xds,
+ struct Main *bmain,
+ struct Depsgraph *depsgraph);
+void ED_object_data_xform_container_item_ensure(struct XFormObjectData_Container *xds,
+ struct Object *ob);
+
+/* Object Skip-Child Container helper API. */
+enum {
+ /**
+ * The parent is transformed, this is held in place.
+ */
+ XFORM_OB_SKIP_CHILD_PARENT_IS_XFORM = 1,
+ /**
+ * The same as #XFORM_OB_SKIP_CHILD_PARENT_IS_XFORM,
+ * however this objects parent isn't transformed directly.
+ */
+ XFORM_OB_SKIP_CHILD_PARENT_IS_XFORM_INDIRECT = 3,
+ /**
+ * Use the parent invert matrix to apply transformation,
+ * this is needed, because breaks in the selection chain prevents this from being transformed.
+ * This is used to add the transform which would have been added
+ * if there weren't breaks in the parent/child chain.
+ */
+ XFORM_OB_SKIP_CHILD_PARENT_APPLY = 2,
+};
+struct XFormObjectSkipChild_Container;
+struct XFormObjectSkipChild_Container *ED_object_xform_skip_child_container_create(void);
+void ED_object_xform_skip_child_container_item_ensure_from_array(
+ struct XFormObjectSkipChild_Container *xcs,
+ struct ViewLayer *view_layer,
+ struct Object **objects,
+ uint objects_len);
+void ED_object_xform_skip_child_container_destroy(struct XFormObjectSkipChild_Container *xcs);
+void ED_object_xform_skip_child_container_update_all(struct XFormObjectSkipChild_Container *xcs,
+ struct Main *bmain,
+ struct Depsgraph *depsgraph);
+void ED_object_xform_skip_child_container_item_ensure(struct XFormObjectSkipChild_Container *xcs,
+ struct Object *ob,
+ struct Object *ob_parent_recurse,
+ int mode);
+
/* object_ops.c */
void ED_operatortypes_object(void);
void ED_operatormacros_object(void);
@@ -421,16 +466,6 @@ void ED_object_data_xform_by_mat4(struct XFormObjectData *xod, const float mat[4
void ED_object_data_xform_restore(struct XFormObjectData *xod);
void ED_object_data_xform_tag_update(struct XFormObjectData *xod);
-/* Container helper API. */
-struct XFormObjectData_Container;
-struct XFormObjectData_Container *ED_object_data_xform_container_create(void);
-void ED_object_data_xform_container_destroy(struct XFormObjectData_Container *xds);
-void ED_object_data_xform_container_update_all(struct XFormObjectData_Container *xds,
- struct Main *bmain,
- struct Depsgraph *depsgraph);
-void ED_object_data_xform_container_item_ensure(struct XFormObjectData_Container *xds,
- struct Object *ob);
-
#ifdef __cplusplus
}
#endif
diff --git a/source/blender/editors/object/object_data_transform.c b/source/blender/editors/object/object_data_transform.c
index b6f125c6f71..6d03ec2774c 100644
--- a/source/blender/editors/object/object_data_transform.c
+++ b/source/blender/editors/object/object_data_transform.c
@@ -580,100 +580,3 @@ void ED_object_data_xform_tag_update(struct XFormObjectData *xod_base)
}
/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Object Data Transform Container
- *
- * Use to implement 'Affect Only Origins' feature.
- *
- * \{ */
-
-struct XFormObjectData_Container {
- GHash *obdata_in_obmode_map;
-};
-
-struct XFormObjectData_Extra {
- Object *ob;
- float obmat_orig[4][4];
- struct XFormObjectData *xod;
-};
-
-void ED_object_data_xform_container_item_ensure(struct XFormObjectData_Container *xds, Object *ob)
-{
- if (xds->obdata_in_obmode_map == NULL) {
- xds->obdata_in_obmode_map = BLI_ghash_ptr_new(__func__);
- }
-
- void **xf_p;
- if (!BLI_ghash_ensure_p(xds->obdata_in_obmode_map, ob->data, &xf_p)) {
- struct XFormObjectData_Extra *xf = MEM_mallocN(sizeof(*xf), __func__);
- copy_m4_m4(xf->obmat_orig, ob->obmat);
- xf->ob = ob;
- /* Result may be NULL, that's OK. */
- xf->xod = ED_object_data_xform_create(ob->data);
- *xf_p = xf;
- }
-}
-
-/**
- * This may be called multiple times with the same data.
- * Each time, the original transformations are re-applied, instead of accumulating the changes.
- */
-void ED_object_data_xform_container_update_all(struct XFormObjectData_Container *xds,
- struct Main *bmain,
- Depsgraph *depsgraph)
-{
- if (xds->obdata_in_obmode_map == NULL) {
- return;
- }
- BKE_scene_graph_evaluated_ensure(depsgraph, bmain);
-
- GHashIterator gh_iter;
- GHASH_ITER (gh_iter, xds->obdata_in_obmode_map) {
- ID *id = BLI_ghashIterator_getKey(&gh_iter);
- struct XFormObjectData_Extra *xf = BLI_ghashIterator_getValue(&gh_iter);
- if (xf->xod == NULL) {
- continue;
- }
-
- Object *ob_eval = DEG_get_evaluated_object(depsgraph, xf->ob);
- float imat[4][4], dmat[4][4];
- invert_m4_m4(imat, xf->obmat_orig);
- mul_m4_m4m4(dmat, imat, ob_eval->obmat);
- invert_m4(dmat);
-
- ED_object_data_xform_by_mat4(xf->xod, dmat);
- if (xf->ob->type == OB_ARMATURE) {
- /* TODO: none of the current flags properly update armatures, needs investigation. */
- DEG_id_tag_update(id, 0);
- }
- else {
- DEG_id_tag_update(id, ID_RECALC_GEOMETRY);
- }
- }
-}
-
-/** Callback for #GHash free. */
-static void trans_obdata_in_obmode_free_elem(void *xf_p)
-{
- struct XFormObjectData_Extra *xf = xf_p;
- if (xf->xod) {
- ED_object_data_xform_destroy(xf->xod);
- }
- MEM_freeN(xf);
-}
-
-struct XFormObjectData_Container *ED_object_data_xform_container_create(void)
-{
- struct XFormObjectData_Container *xds = MEM_callocN(sizeof(*xds), __func__);
- xds->obdata_in_obmode_map = BLI_ghash_ptr_new(__func__);
- return xds;
-}
-
-void ED_object_data_xform_container_destroy(struct XFormObjectData_Container *xds)
-{
- BLI_ghash_free(xds->obdata_in_obmode_map, NULL, trans_obdata_in_obmode_free_elem);
- MEM_freeN(xds);
-}
-
-/** \} */
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 26fd66c7f3e..4f56664ec99 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -44,6 +44,7 @@
#include "BKE_curve.h"
#include "BKE_main.h"
#include "BKE_idcode.h"
+#include "BKE_layer.h"
#include "BKE_mball.h"
#include "BKE_mesh.h"
#include "BKE_object.h"
@@ -296,22 +297,43 @@ static int object_clear_transform_generic_exec(bContext *C,
Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
+ ViewLayer *view_layer = CTX_data_view_layer(C);
+ /* May be NULL. */
+ View3D *v3d = CTX_wm_view3d(C);
KeyingSet *ks;
const bool clear_delta = RNA_boolean_get(op->ptr, "clear_delta");
- /* sanity checks */
- if (ELEM(NULL, clear_func, default_ksName)) {
- BKE_report(op->reports,
- RPT_ERROR,
- "Programming error: missing clear transform function or keying set name");
+ BLI_assert(!ELEM(NULL, clear_func, default_ksName));
+
+ Object **objects = NULL;
+ uint objects_len = 0;
+ {
+ BLI_array_declare(objects);
+ FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN (view_layer, v3d, ob) {
+ BLI_array_append(objects, ob);
+ }
+ FOREACH_SELECTED_EDITABLE_OBJECT_END;
+ objects_len = BLI_array_len(objects);
+ }
+
+ if (objects == NULL) {
return OPERATOR_CANCELLED;
}
/* Support transforming the object data. */
+ const bool use_transform_skip_children = (scene->toolsettings->transform_flag &
+ SCE_XFORM_SKIP_CHILDREN);
const bool use_transform_data_origin = (scene->toolsettings->transform_flag &
SCE_XFORM_DATA_ORIGIN);
+ struct XFormObjectSkipChild_Container *xcs = NULL;
struct XFormObjectData_Container *xds = NULL;
+ if (use_transform_skip_children) {
+ BKE_scene_graph_evaluated_ensure(depsgraph, bmain);
+ xcs = ED_object_xform_skip_child_container_create();
+ ED_object_xform_skip_child_container_item_ensure_from_array(
+ xcs, view_layer, objects, objects_len);
+ }
if (use_transform_data_origin) {
BKE_scene_graph_evaluated_ensure(depsgraph, bmain);
xds = ED_object_data_xform_container_create();
@@ -320,7 +342,8 @@ static int object_clear_transform_generic_exec(bContext *C,
/* get KeyingSet to use */
ks = ANIM_get_keyingset_for_autokeying(scene, default_ksName);
- CTX_DATA_BEGIN (C, Object *, ob, selected_editable_objects) {
+ for (uint ob_index = 0; ob_index < objects_len; ob_index++) {
+ Object *ob = objects[ob_index];
if (use_transform_data_origin) {
ED_object_data_xform_container_item_ensure(xds, ob);
@@ -334,7 +357,12 @@ static int object_clear_transform_generic_exec(bContext *C,
/* tag for updates */
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
}
- CTX_DATA_END;
+ MEM_freeN(objects);
+
+ if (use_transform_skip_children) {
+ ED_object_xform_skip_child_container_update_all(xcs,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list