Skip to content

Commit 7067004

Browse files
fnordwarefnordware
authored
After Effects and Photoshop plug-in build updates (#1394)
Signed-off-by: Brendan Bolles <brendan@fnordware.com>
1 parent 9d96454 commit 7067004

25 files changed

Lines changed: 125 additions & 101 deletions

File tree

‎vendor/aftereffects/OpenColorIO_AE.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ static PF_Err GlobalSetup(
5757
PF_OutFlag2_FLOAT_COLOR_AWARE |
5858
PF_OutFlag2_PPRO_DO_NOT_CLONE_SEQUENCE_DATA_FOR_RENDER |
5959
PF_OutFlag2_SUPPORTS_GET_FLATTENED_SEQUENCE_DATA |
60-
PF_OutFlag2_SUPPORTS_THREADED_RENDERING;
60+
PF_OutFlag2_SUPPORTS_THREADED_RENDERING |
61+
PF_OutFlag2_MUTABLE_RENDER_SEQUENCE_DATA_SLOWER;
6162

6263

6364
GlobalSetup_GL();
@@ -389,7 +390,7 @@ static PF_Err SequenceResetup(
389390
PF_UNLOCK_HANDLE(in_data->sequence_data);
390391
}
391392
else
392-
assert(FALSE);
393+
err = SequenceSetup(in_data, out_data, params, output); // getting this after pasting the effect
393394

394395
return err;
395396
}

‎vendor/aftereffects/OpenColorIO_AE_PiPL.r‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ resource 'PiPL' (16000) {
6060
50365504
6161
},
6262
AE_Effect_Global_OutFlags_2 {
63-
142644232
63+
411079688
6464
},
6565
/* [11] */
6666
AE_Effect_Match_Name {

‎vendor/aftereffects/vc/vc15/OpenColorABI.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// Makefile configuration options
88
#define OCIO_NAMESPACE OpenColorIO
99

10-
#define OCIO_VERSION_STR "2.0.0"
10+
#define OCIO_VERSION_STR "2.0.1"
1111
#define OCIO_VERSION_STATUS_STR ""
12-
#define OCIO_VERSION_FULL_STR "2.0.0"
12+
#define OCIO_VERSION_FULL_STR "2.0.1"
1313

1414
/* Version as a single 4-byte hex number, e.g. 0x01050200 == 1.5.2
1515
Use this for numeric comparisons, e.g. #if OCIO_VERSION_HEX >= ...
@@ -18,7 +18,7 @@
1818
*/
1919
#define OCIO_VERSION_HEX ((2 << 24) | \
2020
(0 << 16) | \
21-
(0 << 8))
21+
(1 << 8))
2222

2323
#define OCIO_VERSION_MAJOR 2
2424
#define OCIO_VERSION_MINOR 0

‎vendor/aftereffects/vc/vc15/OpenColorIO.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@
476476
<ClCompile>
477477
<Optimization>Disabled</Optimization>
478478
<SDLCheck>true</SDLCheck>
479-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;_SCL_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
479+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;_SCL_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
480480
<ConformanceMode>true</ConformanceMode>
481481
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
482482
<AdditionalOptions>/wd4146</AdditionalOptions>
@@ -491,7 +491,7 @@
491491
<ClCompile>
492492
<Optimization>Disabled</Optimization>
493493
<SDLCheck>true</SDLCheck>
494-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;_SCL_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
494+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;_SCL_SECURE_NO_WARNINGS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
495495
<ConformanceMode>true</ConformanceMode>
496496
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
497497
<AdditionalOptions>/wd4146</AdditionalOptions>
@@ -508,7 +508,7 @@
508508
<WarningLevel>Level3</WarningLevel>
509509
<Optimization>Disabled</Optimization>
510510
<SDLCheck>true</SDLCheck>
511-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
511+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
512512
<ConformanceMode>true</ConformanceMode>
513513
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
514514
<AdditionalOptions>/wd4146</AdditionalOptions>
@@ -524,7 +524,7 @@
524524
<WarningLevel>Level3</WarningLevel>
525525
<Optimization>Disabled</Optimization>
526526
<SDLCheck>true</SDLCheck>
527-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
527+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
528528
<ConformanceMode>true</ConformanceMode>
529529
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
530530
<AdditionalOptions>/wd4146</AdditionalOptions>
@@ -542,7 +542,7 @@
542542
<FunctionLevelLinking>true</FunctionLevelLinking>
543543
<IntrinsicFunctions>true</IntrinsicFunctions>
544544
<SDLCheck>true</SDLCheck>
545-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
545+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
546546
<ConformanceMode>true</ConformanceMode>
547547
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
548548
<AdditionalOptions>/wd4146</AdditionalOptions>
@@ -562,7 +562,7 @@
562562
<FunctionLevelLinking>true</FunctionLevelLinking>
563563
<IntrinsicFunctions>true</IntrinsicFunctions>
564564
<SDLCheck>true</SDLCheck>
565-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
565+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
566566
<ConformanceMode>true</ConformanceMode>
567567
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
568568
<AdditionalOptions>/wd4146</AdditionalOptions>
@@ -581,7 +581,7 @@
581581
<FunctionLevelLinking>true</FunctionLevelLinking>
582582
<IntrinsicFunctions>true</IntrinsicFunctions>
583583
<SDLCheck>true</SDLCheck>
584-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
584+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;_SCL_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
585585
<ConformanceMode>true</ConformanceMode>
586586
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
587587
<AdditionalOptions>/wd4146</AdditionalOptions>
@@ -600,7 +600,7 @@
600600
<FunctionLevelLinking>true</FunctionLevelLinking>
601601
<IntrinsicFunctions>true</IntrinsicFunctions>
602602
<SDLCheck>true</SDLCheck>
603-
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;ADD_EXTRA_BUILTINS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
603+
<PreprocessorDefinitions>OpenColorIO_SKIP_IMPORTS;XML_STATIC;_SCL_SECURE_NO_WARNINGS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
604604
<ConformanceMode>true</ConformanceMode>
605605
<AdditionalIncludeDirectories>.;..\..\..\..\include;..\..\..\..\src;..\..\..\..\src\OpenColorIO;..\..\..\..\ext\openexr\IlmBase;..\..\..\..\ext\yaml-cpp\include;..\..\..\..\ext\libexpat\expat\expat;..\..\..\..\ext\pystring;..\..\..\..\ext\sampleicc\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
606606
<AdditionalOptions>/wd4146</AdditionalOptions>

0 commit comments

Comments
 (0)