Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Src/MotionCodeLibrary/curveEditor_popup.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,9 @@ void ORPopup_ColorEditor::UIConfigure()
mEditAlpha.Max = 255.0;
mEditAlpha.OnChange.Add( this, (FBCallback) &ORPopup_ColorEditor::EventEditColorChange );

#if(PRODUCT_VERSION<2027)
mEditColor.ColorMode = 3;
#endif
mEditColor.OnChange.Add( this, (FBCallback) &ORPopup_ColorEditor::EventEditColorChange );

Restructure(true);
Expand Down
2 changes: 1 addition & 1 deletion Src/PRODUCT_VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025
2027
25 changes: 24 additions & 1 deletion Src/Projects/manager_PostProcessing/postprocesscontextdata.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,31 @@ void PostProcessContextData::PreRenderFirstEntry()
if (schematic >= 0)
mSchematicView[schematic] = true;

#if(PRODUCT_VERSION>=2027)
switch (pRenderer->GetPanesLayoutMode())
{
case kFBOnePane:
mLastPaneCount = 1;
break;
case kFBTwoPanesHorizontal:
case kFBTwoPanesVertical:
mLastPaneCount = 2;
break;
case kFBThreePanesSplitBottom:
case kFBThreePanesSplitLeft:
case kFBThreePanesSplitRight:
case kFBThreePanesSplitTop:
mLastPaneCount = 3;
break;
case kFBFourPanes:
mLastPaneCount = 4;
break;
default:
mLastPaneCount = 1;
}
#else
mLastPaneCount = pRenderer->GetPaneCount();

#endif
// DONE: this is strict post effect pane index, should we choose another one ?!

for (int i = 0; i < mLastPaneCount; ++i)
Expand Down
4 changes: 1 addition & 3 deletions Src/Projects/manip_lockCamera/lockcamera_manip.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,7 @@ bool Manip_LockCamera::ViewInput(int pMouseX, int pMouseY, FBInputType pAction,
{
FBRenderer *pRenderer = mSystem.Renderer;
unsigned int currPane = pRenderer->GetSelectedPaneIndex();
pRenderer->GetPaneCount();



// Mouse button clicked.

FBCamera* lCamera = pRenderer->GetCameraInPane(currPane);
Expand Down
Loading