blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

Cleanup: Remove legacy dupli system from point cloud object 

The "dupli" system now has a faster, more powerful, and more flexible
alternative with geometry nodes. Since the point cloud objects haven't
been exposed in the non-experimental UI yet, we can remove the dupli
implementation and the panel for the object type.

Differential Revision: https://developer.blender.org/D14482
This commit is contained in:
Hans Goudey 2022-03-29 10:16:05 -05:00
parent c4e4924096
commit 1f6c2507f8
3 changed files with 1 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_object.py
View File

@ -246,7 +246,7 @@ class OBJECT_PT_instancing(ObjectButtonsPanel, Panel):
def poll(cls, context):
ob = context.object
# FONT objects need (vertex) instancing for the 'Object Font' feature
return (ob.type in {'MESH', 'EMPTY', 'POINTCLOUD', 'FONT'})
return (ob.type in {'MESH', 'EMPTY', 'FONT'})
def draw(self, context):
layout = self.layout

65
source/blender/blenkernel/intern/object_dupli.cc
View File

@ -765,68 +765,6 @@ static const DupliGenerator gen_dupli_verts_font = {
/** \} */
/* -------------------------------------------------------------------- */
/** \name Dupli-Vertices Implementation (#OB_DUPLIVERTS for #PointCloud)
* \{ */
static void make_child_duplis_pointcloud(const DupliContext *ctx,
void *UNUSED(userdata),
Object *child)
{
const Object *parent = ctx->object;
const PointCloud *pointcloud = (PointCloud *)parent->data;
const float(*co)[3] = pointcloud->co;
const float *radius = pointcloud->radius;
const float(*rotation)[4] = nullptr; /* TODO: add optional rotation attribute. */
const float(*orco)[3] = nullptr; /* TODO: add optional texture coordinate attribute. */
/* Relative transform from parent to child space. */
float child_imat[4][4];
mul_m4_m4m4(child_imat, child->imat, parent->obmat);
for (int i = 0; i < pointcloud->totpoint; i++) {
/* Transform matrix from point position, radius and rotation. */
float quat[4] = {1.0f, 0.0f, 0.0f, 0.0f};
float size[3] = {1.0f, 1.0f, 1.0f};
if (radius) {
copy_v3_fl(size, radius[i]);
}
if (rotation) {
copy_v4_v4(quat, rotation[i]);
}
float space_mat[4][4];
loc_quat_size_to_mat4(space_mat, co[i], quat, size);
/* Make offset relative to child object using relative child transform,
* and apply object matrix after local vertex transform. */
mul_mat3_m4_v3(child_imat, space_mat[3]);
/* Create dupli object. */
float obmat[4][4];
mul_m4_m4m4(obmat, child->obmat, space_mat);
DupliObject *dob = make_dupli(ctx, child, obmat, i);
if (orco) {
copy_v3_v3(dob->orco, orco[i]);
}
/* Recursion. */
make_recursive_duplis(ctx, child, space_mat, i);
}
}
static void make_duplis_pointcloud(const DupliContext *ctx)
{
make_child_duplis(ctx, nullptr, make_child_duplis_pointcloud);
}
static const DupliGenerator gen_dupli_verts_pointcloud = {
OB_DUPLIVERTS, /* type */
make_duplis_pointcloud /* make_duplis */
};
/** \} */
/* -------------------------------------------------------------------- */
/** \name Instances Geometry Component Implementation
* \{ */
@ -1654,9 +1592,6 @@ static const DupliGenerator *get_dupli_generator(const DupliContext *ctx)
if (ctx->object->type == OB_MESH) {
return &gen_dupli_verts;
}
if (ctx->object->type == OB_POINTCLOUD) {
return &gen_dupli_verts_pointcloud;
}
}
else if (transflag & OB_DUPLIFACES) {
if (ctx->object->type == OB_MESH) {

9
source/blender/makesrna/intern/rna_object.c
View File

@ -200,12 +200,6 @@ static EnumPropertyItem instance_items_nogroup[] = {
{0, NULL, 0, NULL, NULL},
};
static EnumPropertyItem instance_items_pointcloud[] = {
{0, "NONE", 0, "None", ""},
{OB_DUPLIVERTS, "POINTS", 0, "Points", "Instantiate child objects on all points"},
{0, NULL, 0, NULL, NULL},
};
static EnumPropertyItem instance_items_empty[] = {
{0, "NONE", 0, "None", ""},
INSTANCE_ITEM_COLLECTION,
@ -760,9 +754,6 @@ static const EnumPropertyItem *rna_Object_instance_type_itemf(bContext *UNUSED(C
if (ob->type == OB_EMPTY) {
item = instance_items_empty;
}
else if (ob->type == OB_POINTCLOUD) {
item = instance_items_pointcloud;
}
else if (ob->type == OB_FONT) {
item = instance_items_font;
}