blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

added missing include

This commit is contained in:
Gaia Clary 2016-05-29 01:38:14 +02:00
parent af185e1154
commit cd4d80fac6
Notes: blender-bot 2023-02-14 09:48:25 +01:00 
Referenced by issue #48542, OSL crash on 32bit
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/collada/collada_utils.cpp
View File

@ -517,7 +517,7 @@ void BoneExtended::set_bone_layers(std::string layerString, std::vector<std::str
if (isInteger(layer))
{
pos = atoi(layer.c_str());
if (pos >= 0 || pos < 32) {
if (pos >= 0 && pos < 32) {
this->bone_layers = bc_set_layer(this->bone_layers, pos);
continue;
}

1
source/blender/collada/collada_utils.h
View File

@ -34,6 +34,7 @@
#include <vector>
#include <map>
#include <algorithm>
extern "C" {
#include "DNA_object_types.h"