blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 783 Projects 19 Wiki Activity

Geometry Nodes: Simulation calculate to frame operator #107627

Merged
Lukas Tönne merged 3 commits from LukasTonne/blender:cache-to-frame-op into main 2023-05-08 13:41:28 +02:00
Conversation 0 Commits 3 Files Changed 5 +2 -13
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2bfe8697de - Show all commits

15
source/blender/editors/object/object_bake_simulation.cc
View File

@ -59,15 +59,6 @@ static bool calculate_to_frame_poll(bContext *C)
return true;
}
struct ModifierCalculateData {
NodesModifierData *nmd;
std::unique_ptr<bke::sim::BDataSharing> bdata_sharing;
};
struct ObjectCalculateData {
Object *object;
};
struct CalculateSimulationJob {
LukasTonne marked this conversation as resolved
Hans Goudey commented 2023-05-04 18:57:50 +02:00
Review
Copy Link

Unused struct here

Unused struct here
wmWindowManager *wm;
Main *bmain;
@ -90,13 +81,11 @@ static void calculate_simulation_job_startjob(void *customdata,
G.is_break = false;
WM_set_locked_interface(job.wm, true);
Vector<ObjectCalculateData> objects_to_calc;
Vector<Object *> objects_to_calc;
for (Object *object : job.objects) {
if (!BKE_id_is_editable(job.bmain, &object->id)) {
continue;
}
ObjectCalculateData calc_data;
calc_data.object = object;
LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
if (md->type == eModifierType_Nodes) {
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);
@ -105,7 +94,7 @@ static void calculate_simulation_job_startjob(void *customdata,
}
}
}
objects_to_calc.append(std::move(calc_data));
objects_to_calc.append(object);
}
*progress = 0.0f;