Placeholder
/
rnr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove DONT_USE_BRICKCOLOR_MATERIAL

This commit is contained in:
floralrainfall 2023-07-16 19:59:03 -04:00
parent 452f4f0f92
commit 013b9f513b
3 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/RNR/textures/studio/icons/Camera.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
Projects/Engine/Header/App/V8/DataModel/Camera.hpp
View File

@ -17,6 +17,7 @@ namespace RNR
Camera(); Camera();
~Camera(); ~Camera();
virtual std::string getClassName() { return "Camera"; }
CoordinateFrame& getCFrame() { return m_cframe; }; CoordinateFrame& getCFrame() { return m_cframe; };
void setCFrame(CoordinateFrame cframe) { m_cframe = cframe; }; void setCFrame(CoordinateFrame cframe) { m_cframe = cframe; };
bool zoom(float distance); bool zoom(float distance);

1
Projects/Engine/Source/App/V8/DataModel/Workspace.cpp
View File

@ -25,7 +25,6 @@ namespace RNR
PartInstance* child_part = dynamic_cast<PartInstance*>(instance); PartInstance* child_part = dynamic_cast<PartInstance*>(instance);
if(child_part) if(child_part)
{ {
#define DONT_USE_BRICKCOLOR_MATERIAL
#ifndef DONT_USE_BRICKCOLOR_MATERIAL #ifndef DONT_USE_BRICKCOLOR_MATERIAL
m_partEntity->setMaterial(BrickColor::material(child_part->getBrickColor())); m_partEntity->setMaterial(BrickColor::material(child_part->getBrickColor()));
#endif #endif