Blender Git Loki
Git Commits -> Revision 5a9a163
Revision 5a9a163 by Jacques Lucke (master) September 6, 2021, 16:31 (GMT) |
Geometry Nodes: support for geometry instancing Previously, the Point Instance node in geometry nodes could only instance existing objects or collections. The reason was that large parts of Blender worked under the assumption that objects are the main unit of instancing. Now we also want to instance geometry within an object, so a slightly larger refactor was necessary. This should not affect files that do not use the new kind of instances. The main change is a redefinition of what "instanced data" is. Now, an instances is a cow-object + object-data (the geometry). This can be nicely seen in `struct DupliObject`. This allows the same object to generate multiple geometries of different types which can be instanced individually. A nice side effect of this refactor is that having multiple geometry components is not a special case in the depsgraph object iterator anymore, because those components are integrated with the `DupliObject` system. Unfortunately, different systems that work with instances in Blender (e.g. render engines and exporters) often work under the assumption that objects are the main unit of instancing. So those have to be updated as well to be able to handle the new instances. This patch updates Cycles, EEVEE and other viewport engines. Exporters have not been updated yet. Some minimal (not master-ready) changes to update the obj and alembic exporters can be found in P2336 and P2335. Different file formats may want to handle these new instances in different ways. For users, the only thing that changed is that the Point Instance node now has a geometry mode. This also fixes T88454. Differential Revision: https://developer.blender.org/D11841 |
Commit Details:
Full Hash: 5a9a16334c573c4566dc9b2a314cf0d0ccdcb54f
Parent Commit: d9ad77f
Lines Changed: +501, -314
30 Modified Paths:
/intern/cycles/blender/blender_curves.cpp (+24, -18) (Diff)
/intern/cycles/blender/blender_geometry.cpp (+21, -21) (Diff)
/intern/cycles/blender/blender_light.cpp (+7, -8) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+36, -25) (Diff)
/intern/cycles/blender/blender_object.cpp (+7, -19) (Diff)
/intern/cycles/blender/blender_sync.h (+17, -12) (Diff)
/intern/cycles/blender/blender_util.h (+41, -8) (Diff)
/intern/cycles/blender/blender_volume.cpp (+12, -9) (Diff)
/source/blender/blenkernel/BKE_duplilist.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_geometry_set.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_geometry_set.hh (+42, -3) (Diff)
/source/blender/blenkernel/BKE_object.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/geometry_component_instances.cc (+12, -3) (Diff)
/source/blender/blenkernel/intern/geometry_set.cc (+35, -2) (Diff)
/source/blender/blenkernel/intern/geometry_set_instances.cc (+12, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+11, -2) (Diff)
/source/blender/blenkernel/intern/object_dupli.cc (+81, -16) (Diff)
/source/blender/blenlib/BLI_user_counter.hh (+12, -0) (Diff)
/source/blender/depsgraph/DEG_depsgraph_query.h (+1, -9) (Diff)
/source/blender/depsgraph/intern/depsgraph_query_iter.cc (+9, -129) (Diff)
/source/blender/draw/intern/draw_manager.c (+51, -13) (Diff)
/source/blender/draw/intern/draw_manager.h (+12, -3) (Diff)
/source/blender/editors/object/object_add.c (+2, -8) (Diff)
/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh (+5, -0) (Diff)
/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc (+5, -0) (Diff)
/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc (+17, -0) (Diff)
/source/blender/editors/transform/transform_snap_object.c (+1, -3) (Diff)
/source/blender/makesdna/DNA_node_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -0) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc (+15, -2) (Diff)
/intern/cycles/blender/blender_geometry.cpp (+21, -21) (Diff)
/intern/cycles/blender/blender_light.cpp (+7, -8) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+36, -25) (Diff)
/intern/cycles/blender/blender_object.cpp (+7, -19) (Diff)
/intern/cycles/blender/blender_sync.h (+17, -12) (Diff)
/intern/cycles/blender/blender_util.h (+41, -8) (Diff)
/intern/cycles/blender/blender_volume.cpp (+12, -9) (Diff)
/source/blender/blenkernel/BKE_duplilist.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_geometry_set.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_geometry_set.hh (+42, -3) (Diff)
/source/blender/blenkernel/BKE_object.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/geometry_component_instances.cc (+12, -3) (Diff)
/source/blender/blenkernel/intern/geometry_set.cc (+35, -2) (Diff)
/source/blender/blenkernel/intern/geometry_set_instances.cc (+12, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+11, -2) (Diff)
/source/blender/blenkernel/intern/object_dupli.cc (+81, -16) (Diff)
/source/blender/blenlib/BLI_user_counter.hh (+12, -0) (Diff)
/source/blender/depsgraph/DEG_depsgraph_query.h (+1, -9) (Diff)
/source/blender/depsgraph/intern/depsgraph_query_iter.cc (+9, -129) (Diff)
/source/blender/draw/intern/draw_manager.c (+51, -13) (Diff)
/source/blender/draw/intern/draw_manager.h (+12, -3) (Diff)
/source/blender/editors/object/object_add.c (+2, -8) (Diff)
/source/blender/editors/space_spreadsheet/spreadsheet_cell_value.hh (+5, -0) (Diff)
/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc (+5, -0) (Diff)
/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc (+17, -0) (Diff)
/source/blender/editors/transform/transform_snap_object.c (+1, -3) (Diff)
/source/blender/makesdna/DNA_node_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -0) (Diff)
/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc (+15, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021