Skip to content

Commit

Permalink
Updating the versions specified in the #ifdefs to the actual versions…
Browse files Browse the repository at this point in the history
… that these features were supported in.

(Internal change: 2345006)
  • Loading branch information
sarahsunnysideup authored and pixar-oss committed Oct 25, 2024
1 parent 9f2f906 commit a652faa
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// https://openusd.org/license.

#include "hdPrman/renderPassSceneIndex.h"
#if PXR_VERSION >= 2405
#if PXR_VERSION >= 2408
#include "hdPrman/tokens.h"

#include "pxr/imaging/hd/version.h"
Expand Down Expand Up @@ -547,4 +547,4 @@ HdPrman_RenderPassSceneIndex::_UpdateActiveRenderPassState(
}

PXR_NAMESPACE_CLOSE_SCOPE
#endif //PXR_VERSION >= 2405
#endif //PXR_VERSION >= 2408
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_H

#include "pxr/pxr.h"
#if PXR_VERSION >= 2405
#if PXR_VERSION >= 2408
#include "pxr/imaging/hd/collectionExpressionEvaluator.h"
#include "pxr/imaging/hd/filteringSceneIndex.h"
#include <optional>
Expand Down Expand Up @@ -92,4 +92,4 @@ class HdPrman_RenderPassSceneIndex :
PXR_NAMESPACE_CLOSE_SCOPE

#endif
#endif // PXR_VERSION >= 2405
#endif // PXR_VERSION >= 2408
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "hdPrman/renderPassSceneIndexPlugin.h"

#if PXR_VERSION >= 2405
#if PXR_VERSION >= 2408

#include "hdPrman/tokens.h"

Expand Down Expand Up @@ -56,4 +56,4 @@ HdPrman_RenderPassSceneIndexPlugin::_AppendSceneIndex(

PXR_NAMESPACE_CLOSE_SCOPE

#endif // PXR_VERSION >= 2405
#endif // PXR_VERSION >= 2408
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define EXT_RMANPKG_25_0_PLUGIN_RENDERMAN_PLUGIN_HD_PRMAN_RENDER_PASS_SCENE_INDEX_PLUGIN_H

#include "pxr/pxr.h"
#if PXR_VERSION >= 2405
#if PXR_VERSION >= 2408
#include "pxr/imaging/hd/sceneIndexPlugin.h"
#include "hdPrman/api.h"

Expand All @@ -33,4 +33,4 @@ class HdPrman_RenderPassSceneIndexPlugin : public HdSceneIndexPlugin
PXR_NAMESPACE_CLOSE_SCOPE

#endif
#endif //PXR_VERSION >= 2405
#endif //PXR_VERSION >= 2408
6 changes: 3 additions & 3 deletions third_party/renderman-26/plugin/hdPrman/renderSettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ _UpdateRileyCamera(
}
}

#if PXR_VERSION >= 2405
#if PXR_VERSION >= 2407
// Update the Frame number from the Stage Global Scene Index
void
_UpdateFrame(
Expand Down Expand Up @@ -563,7 +563,7 @@ void HdPrman_RenderSettings::_Sync(
}
#endif

#if PXR_VERSION >= 2405
#if PXR_VERSION >= 2407
if (*dirtyBits & HdRenderSettings::DirtyFrameNumber ||
*dirtyBits & HdRenderSettings::DirtyNamespacedSettings) {
_UpdateFrame(terminalSi, &_settingsOptions);
Expand All @@ -587,7 +587,7 @@ void HdPrman_RenderSettings::_Sync(

param->SetDrivingRenderSettingsPrimPath(GetId());

#if PXR_VERSION >= 2405
#if PXR_VERSION >= 2407
if (*dirtyBits & HdRenderSettings::DirtyNamespacedSettings ||
*dirtyBits & HdRenderSettings::DirtyActive ||
*dirtyBits & HdRenderSettings::DirtyShutterInterval ||
Expand Down

0 comments on commit a652faa

Please sign in to comment.