Paths

Table of Contentst

Differential D16137

Geometry Nodes: Separate Instances from InstancesComponent.
ClosedPublic
Actions

Authored by Jacques Lucke (JacquesLucke) on Oct 4 2022, 9:53 AM.

Tags

None

Subscribers

None

Details

Reviewers

Hans Goudey (HooglyBoogly)

Commits

rBe5425b566d0f: Geometry Nodes: separate Instances from InstancesComponent

Summary

This makes instance handling more consistent with all the other geometry component types. For example, MeshComponent contains a Mesh * and now InstancesComponent has a Instances *.

Diff Detail

Repository: rB Blender

Event Timeline

Jacques Lucke (JacquesLucke) requested review of this revision.Oct 4 2022, 9:53 AM

Jacques Lucke (JacquesLucke) created this revision.

Harbormaster completed remote builds in B24089: Diff 56423.Oct 4 2022, 9:53 AM

https://builder.blender.org/admin/#/builders/136/builds/130

Jacques Lucke (JacquesLucke) added a reviewer: Hans Goudey (HooglyBoogly).Oct 4 2022, 9:58 AM

Good change!

source/blender/blenkernel/BKE_instances.hh
249–257	Maybe we could just avoid exposing these completely, they're redundant with the `BKE_attribute.hh` API.
source/blender/blenkernel/intern/geometry_set_instances.cc
158–237	Eventually we could move everything here to `instances.cc`, that might be nice

This revision is now accepted and ready to land.Oct 4 2022, 5:34 PM

Jacques Lucke (JacquesLucke) marked 2 inline comments as done.Oct 17 2022, 11:16 AM

Jacques Lucke (JacquesLucke) added inline comments.

source/blender/blenkernel/BKE_instances.hh
249–257	Yeah, can be done outside of this refactor.
source/blender/blenkernel/intern/geometry_set_instances.cc
158–237	Yup.

Closed by commit rBe5425b566d0f: Geometry Nodes: separate Instances from InstancesComponent (authored by Jacques Lucke (JacquesLucke)). · Explain WhyOct 17 2022, 11:40 AM

This revision was automatically updated to reflect the committed changes.

Jacques Lucke (JacquesLucke) marked 2 inline comments as done.

Jacques Lucke (JacquesLucke) added a commit: rBe5425b566d0f: Geometry Nodes: separate Instances from InstancesComponent.

Revision Contents
Changeset List

Path

Size

source/

blender/

blenkernel/

BKE_geometry_fields.hh

13 lines

BKE_geometry_set.hh

251 lines

BKE_instances.hh

270 lines

2 lines

intern/

geometry_component_instances.cc

385 lines

geometry_fields.cc

16 lines

geometry_set.cc

58 lines

geometry_set_instances.cc

45 lines

348 lines

object_dupli.cc

17 lines

editors/

space_spreadsheet/

spreadsheet_column.cc

3 lines

spreadsheet_data_source_geometry.cc

49 lines

spreadsheet_layout.cc

13 lines

spreadsheet_row_filter.cc

16 lines

geometry/

intern/

realize_instances.cc

46 lines

nodes/

geometry/

nodes/

node_geo_collection_info.cc

18 lines

node_geo_delete_geometry.cc

7 lines

node_geo_duplicate_elements.cc

32 lines

node_geo_geometry_to_instance.cc

12 lines

node_geo_input_instance_rotation.cc

9 lines

node_geo_input_instance_scale.cc

9 lines

node_geo_instance_on_points.cc

42 lines

node_geo_instances_to_points.cc

5 lines

node_geo_join_geometry.cc

35 lines

node_geo_object_info.cc

10 lines

node_geo_rotate_instances.cc

17 lines

node_geo_scale_instances.cc

17 lines

node_geo_string_to_curves.cc

24 lines

node_geo_transform.cc

19 lines

node_geo_translate_instances.cc

19 lines

intern/

geometry_nodes_log.cc

2 lines

Diff 56857

source/blender/blenkernel/BKE_geometry_fields.hh

Loading...

source/blender/blenkernel/BKE_geometry_set.hh

Loading...

source/blender/blenkernel/BKE_instances.hh

Loading...

source/blender/blenkernel/CMakeLists.txt

Loading...

source/blender/blenkernel/intern/geometry_component_instances.cc

Loading...

source/blender/blenkernel/intern/geometry_fields.cc

Loading...

source/blender/blenkernel/intern/geometry_set.cc

Loading...

source/blender/blenkernel/intern/geometry_set_instances.cc

Loading...

source/blender/blenkernel/intern/instances.cc

Loading...

source/blender/blenkernel/intern/object_dupli.cc

Loading...

source/blender/editors/space_spreadsheet/spreadsheet_column.cc

Loading...

source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc

Loading...

source/blender/editors/space_spreadsheet/spreadsheet_layout.cc

Loading...

source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc

Loading...

source/blender/geometry/intern/realize_instances.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_collection_info.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_geometry_to_instance.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_input_instance_rotation.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_input_instance_scale.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_instances_to_points.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_join_geometry.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_object_info.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_rotate_instances.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_scale_instances.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_transform.cc

Loading...

source/blender/nodes/geometry/nodes/node_geo_translate_instances.cc

Loading...

source/blender/nodes/intern/geometry_nodes_log.cc

Loading...