Skip to content

Commit df343aa

Browse files
committed
Moved a SceneKey unused in the importer into an ifdef for exporter-only variables
1 parent 809c3be commit df343aa

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

Framework/Source/Graphics/Scene/SceneExportImportCommon.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ namespace Falcor
4848
static const char* kAmbientIntensity = "ambient_intensity";
4949
#endif
5050

51+
// Values currently only used in the exporter
52+
#ifdef SCENE_EXPORTER
53+
// Default values ignored by importer
54+
static const char* kShadingMetalRough = "metal_rough";
55+
#endif
56+
5157
static const char* kVersion = "version";
5258
static const char* kCameraSpeed = "camera_speed";
5359
static const char* kActiveCamera = "active_camera";
@@ -92,7 +98,6 @@ namespace Falcor
9298

9399
static const char* kMaterial = "material";
94100
static const char* kShadingModel = "shading_model";
95-
static const char* kShadingMetalRough = "metal_rough";
96101
static const char* kShadingSpecGloss = "spec_gloss";
97102

98103
static const char* kUserDefined = "user_defined";

Framework/Source/Graphics/Scene/SceneExporter.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "Utils/Platform/OS.h"
3636
#include "Graphics/Scene/Editor/SceneEditor.h"
3737

38+
#define SCENE_EXPORTER
3839
#include "SceneExportImportCommon.h"
3940

4041

0 commit comments

Comments
 (0)