archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Drop object assets and associated objects at the cursor location

Browse Source 
When dropping asset objects, place them under the mouse-cursor
along with any other objects they link in.

Ref D12935

Reviewed By: Severin
This commit is contained in:
Campbell Barton
2021-10-27 04:19:45 +11:00
parent eaed38cbd3
commit a062d86230
8 changed files with 296 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
source/blender/editors/object/object_utils.c
View File

@@ -36,6 +36,7 @@
#include "BKE_armature.h"
#include "BKE_editmesh.h"
#include "BKE_lattice.h"
#include "BKE_object.h"
#include "BKE_scene.h"
#include "DEG_depsgraph_query.h"
@@ -430,3 +431,70 @@ void ED_object_data_xform_container_destroy(struct XFormObjectData_Container *xd
}
/** \} */
/* -------------------------------------------------------------------- */
/** \name Transform Object Array
*
* Low level object transform function, transforming objects by `matrix`.
* Simple alternative to full transform logic.
* \{ */
static bool object_parent_in_set(GSet *objects_set, Object *ob)
{
for (Object *parent = ob->parent; parent; parent = parent->parent) {
if (BLI_gset_lookup(objects_set, parent)) {
return true;
}
}
return false;
}
void ED_object_xform_array_m4(Object **objects, uint objects_len, const float matrix[4][4])
{
/* Filter out objects that have parents in `objects_set`. */
{
GSet *objects_set = BLI_gset_ptr_new_ex(__func__, objects_len);
for (uint i = 0; i < objects_len; i++) {
BLI_gset_add(objects_set, objects[i]);
}
for (uint i = 0; i < objects_len;) {
if (object_parent_in_set(objects_set, objects[i])) {
objects[i] = objects[--objects_len];
}
else {
i++;
}
}
BLI_gset_free(objects_set, NULL);
}
/* Detect translation only matrix, prevent rotation/scale channels from being touched at all. */
bool is_translation_only;
{
float test_m4_a[4][4], test_m4_b[4][4];
unit_m4(test_m4_a);
copy_m4_m4(test_m4_b, matrix);
zero_v3(test_m4_b[3]);
is_translation_only = equals_m4m4(test_m4_a, test_m4_b);
}
if (is_translation_only) {
for (uint i = 0; i < objects_len; i++) {
Object *ob = objects[i];
add_v3_v3(ob->loc, matrix[3]);
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
}
}
else {
for (uint i = 0; i < objects_len; i++) {
float m4[4][4];
Object *ob = objects[i];
BKE_object_to_mat4(ob, m4);
mul_m4_m4m4(m4, matrix, m4);
BKE_object_apply_mat4(ob, m4, true, true);
DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
}
}
}
/** \} */