diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-03 19:12:39 +0300 |
| commit | e52beb373323122f6d706e887a8ee3e2c58beb2e (patch) | |
| tree | 0e409009d8aa4df733fe50dee504ae361040a171 /source/gameengine | |
| parent | c713e9c4724f2f75e28eb421021ed0428e919aab (diff) | |
| parent | ab695c32974fde8720c04dff47d240b7fa0f8151 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index c390bff09a4..39f517e03e8 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1541,7 +1541,7 @@ static KX_GameObject *gameobject_from_blenderobject( gameobj->AddMesh(meshobj); // gather levels of detail - if (BLI_listbase_count_ex(&ob->lodlevels, 2) > 1) { + if (BLI_listbase_count_at_most(&ob->lodlevels, 2) > 1) { LodLevel *lod = ((LodLevel*)ob->lodlevels.first)->next; Mesh* lodmesh = mesh; Object* lodmatob = ob; |