Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 21:10:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15132 from SamGondelman/text

Browse source 
Case 21621: Fix crash on startup
This commit is contained in:
Sam Gondelman 2019-03-07 16:54:29 -08:00 committed by GitHub
commit 1ed2012a63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/model-baker/src/model-baker/ParseFlowDataTask.cpp
View file

@ -8,10 +8,11 @@
#include "ParseFlowDataTask.h" #include "ParseFlowDataTask.h"
void ParseFlowDataTask::run(const baker::BakeContextPointer& context, const Input& mapping, Output& output) { void ParseFlowDataTask::run(const baker::BakeContextPointer& context, const Input& mappingPair, Output& output) {
FlowData flowData; FlowData flowData;
static const QString FLOW_PHYSICS_FIELD = "flowPhysicsData"; static const QString FLOW_PHYSICS_FIELD = "flowPhysicsData";
static const QString FLOW_COLLISIONS_FIELD = "flowCollisionsData"; static const QString FLOW_COLLISIONS_FIELD = "flowCollisionsData";
auto mapping = mappingPair.second;
for (auto mappingIter = mapping.begin(); mappingIter != mapping.end(); mappingIter++) { for (auto mappingIter = mapping.begin(); mappingIter != mapping.end(); mappingIter++) {
if (mappingIter.key() == FLOW_PHYSICS_FIELD || mappingIter.key() == FLOW_COLLISIONS_FIELD) { if (mappingIter.key() == FLOW_PHYSICS_FIELD || mappingIter.key() == FLOW_COLLISIONS_FIELD) {
QByteArray data = mappingIter.value().toByteArray(); QByteArray data = mappingIter.value().toByteArray();

4
libraries/model-baker/src/model-baker/ParseFlowDataTask.h
View file

@ -12,9 +12,11 @@
#include <hfm/HFM.h> #include <hfm/HFM.h>
#include "Engine.h" #include "Engine.h"
#include "BakerTypes.h"
class ParseFlowDataTask { class ParseFlowDataTask {
public: public:
using Input = QVariantHash; using Input = baker::GeometryMappingPair;
using Output = FlowData; using Output = FlowData;
using JobModel = baker::Job::ModelIO<ParseFlowDataTask, Input, Output>; using JobModel = baker::Job::ModelIO<ParseFlowDataTask, Input, Output>;