Merge branch 'master' into OTIO_load

2022-01-06 13:56:08 +00:00
parent f784695133 2831f6508b
commit b865bfa963
195 changed files with 11848 additions and 9102 deletions
@@ -21,9 +21,9 @@ add_subdirectory(color)
 add_subdirectory(configbase)
 add_subdirectory(diskcache)
 add_subdirectory(export)
+add_subdirectory(footageproperties)
 add_subdirectory(footagerelink)
 add_subdirectory(keyframeproperties)
-add_subdirectory(nodeproperties)
 if(OpenTimelineIO_FOUND)
  add_subdirectory(otioproperties)
 endif()