aryeramaty/blender
0
0
Fork 1
forked from blender/blender
Code Pull Requests Activity

davidhaver-WIP-realize-depth #3

Closed
David-Haver wants to merge 65 commits from David-Haver/blender-old:davidhaver-WIP-realize-depth into WIP-realize-depth
pull from: David-Haver/blender-old:davidhaver-WIP-realize-depth
merge into: aryeramaty:WIP-realize-depth

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 65 Files Changed 5 +8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f18691df21 - Show all commits

8
source/blender/geometry/intern/realize_instances.cc
View File

@ -4,6 +4,7 @@
#include "GEO_join_geometries.hh" #include "GEO_join_geometries.hh"
#include "GEO_realize_instances.hh" #include "GEO_realize_instances.hh"
// #include "BKE_geometry_set.hh"
#include "DNA_collection_types.h" #include "DNA_collection_types.h"
#include "DNA_layer_types.h" #include "DNA_layer_types.h"
@ -262,6 +263,13 @@ struct GatherTasksInfo {
*/ */
Vector<std::unique_ptr<GArray<>>> &r_temporary_arrays; Vector<std::unique_ptr<GArray<>>> &r_temporary_arrays;
// /** Instance components to merge for output geometry. */
// Vector<const InstancesComponent *> instances_components_to_merge;
// /** Base transform for each instance component. */
// Vector<float4x4> instances_components_transforms;
/** All gathered tasks. */ /** All gathered tasks. */
GatherTasks r_tasks; GatherTasks r_tasks;
/** Current offsets while gathering tasks. */ /** Current offsets while gathering tasks. */