finalize sync with current openmfx master

eliemichel · Nov 6, 2022 · d8592ce · d8592ce
1 parent 227097d
commit d8592ce
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/intern/openmfx/blender/CMakeLists.txt b/intern/openmfx/blender/CMakeLists.txt
@@ -24,7 +24,7 @@ get_target_property(INC OpenMfx::Sdk::Cpp::Host INCLUDE_DIRECTORIES)
 list(APPEND OPENMFX_SDK_INCLUDES ${INC})
 get_target_property(INC OpenMfx::Sdk::Cpp::Common INCLUDE_DIRECTORIES)
 list(APPEND OPENMFX_SDK_INCLUDES ${INC})
-get_target_property(INC OpenMfx::Core INCLUDE_DIRECTORIES)
+get_target_property(INC OpenMfx::Core INTERFACE_INCLUDE_DIRECTORIES)
 list(APPEND OPENMFX_SDK_INCLUDES ${INC})
 list(REMOVE_DUPLICATES OPENMFX_SDK_INCLUDES)
 

diff --git a/intern/openmfx/sdk/cpp/common/CMakeLists.txt b/intern/openmfx/sdk/cpp/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB SRC src/*.cpp src/*.h)
+file(GLOB SRC src/*.cpp src/*.c src/*.h)
 add_library(OpenMfx_Sdk_Cpp_Common ${SRC})
 
 target_include_directories(

diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
@@ -182,8 +182,6 @@ set(SRC
 set(INC
   ../../../../intern/clog
   ../../../../intern/openmfx/blender
-  ../../../../intern/openmfx/host
-  ../../../../intern/openmfx/openfx
 
   # Needed for defaults forward declarations.
   ../../blenloader

diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c
@@ -307,8 +307,7 @@ static Sequence *rna_Sequences_new_movie(ID *id,
   SEQ_add_load_data_init(&load_data, name, file, frame_start, channel);
   load_data.fit_method = fit_method;
   load_data.allow_invalid_file = true;
-  double video_start_offset;
-  Sequence *seq = SEQ_add_movie_strip(bmain, scene, seqbase, &load_data, &video_start_offset);
+  Sequence *seq = SEQ_add_movie_strip(bmain, scene, seqbase, &load_data);
 
   DEG_relations_tag_update(bmain);
   DEG_id_tag_update(&scene->id, ID_RECALC_SEQUENCER_STRIPS);
@@ -357,7 +356,7 @@ static Sequence *rna_Sequences_new_sound(ID *id,
   SeqLoadData load_data;
   SEQ_add_load_data_init(&load_data, name, file, frame_start, channel);
   load_data.allow_invalid_file = true;
-  Sequence *seq = SEQ_add_sound_strip(bmain, scene, seqbase, &load_data, 0.0f);
+  Sequence *seq = SEQ_add_sound_strip(bmain, scene, seqbase, &load_data);
 
   if (seq == NULL) {
     BKE_report(reports, RPT_ERROR, "Sequences.new_sound: unable to open sound file");