blender
/
blender
134
399
Fork 582
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

fix: compiler errors on mac_x86_64_10_9

This commit is contained in:
Gaia Clary 2018-11-23 18:38:07 +01:00
parent b9b50c0e39
commit 7eb9091e96
Notes: blender-bot 2023-07-10 10:12:37 +02:00 
Referenced by issue #58026, Eevee: Subsurface radius not affected by nodes plugged into input
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/collada/AnimationImporter.h
View File

@ -182,7 +182,7 @@ public:
// prerequisites:
// animlist_map - map animlist id -> animlist
// curve_map - map anim id -> curve(s)
Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node,
Object *translate_animation_OLD(COLLADAFW::Node *node,
std::map<COLLADAFW::UniqueId, Object *>& object_map,
std::map<COLLADAFW::UniqueId, COLLADAFW::Node *>& root_map,
COLLADAFW::Transformation::TransformationType tm_type,

2
source/blender/collada/MaterialExporter.h
View File

@ -44,7 +44,7 @@ extern "C" {
#include "GeometryExporter.h"
#include "collada_internal.h"
#include "ExportSettings.h"
#include "materials.h"
#include "Materials.h"
class MaterialsExporter: COLLADASW::LibraryMaterials
{