[Bf-blender-cvs] [25313582973] master: Attempt to fix Windows new bpath tests failing, take IV.

Bastien Montagne noreply at git.blender.org
Fri Nov 26 22:40:52 CET 2021


Commit: 25313582973bf8a99c61ee849582b6be67dbf036
Author: Bastien Montagne
Date:   Fri Nov 26 22:39:34 2021 +0100
Branches: master
https://developer.blender.org/rB25313582973bf8a99c61ee849582b6be67dbf036

Attempt to fix Windows new bpath tests failing, take IV.

Follow up to rBdcc500e5a265093bc9cc, rB92daff6ac2adb5bb,
rB61bd5882a20c6f3 and rB08264aaf82da8.

Sorry for the noise, this time should be good.

===================================================================

M	source/blender/blenkernel/intern/bpath_test.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/bpath_test.cc b/source/blender/blenkernel/intern/bpath_test.cc
index df7193c95e3..12dabb11e96 100644
--- a/source/blender/blenkernel/intern/bpath_test.cc
+++ b/source/blender/blenkernel/intern/bpath_test.cc
@@ -51,13 +51,13 @@ namespace blender::bke::tests {
 
 #define TEXT_PATH_ITEM "texts" SEP_STR "text.txt"
 #define TEXT_PATH_ABSOLUTE ABSOLUTE_ROOT TEXT_PATH_ITEM
-#define TEXT_PATH_ABSOLUTE_MADE_RELATIVE RELATIVE_ROOT ".." TEXT_PATH_ABSOLUTE
+#define TEXT_PATH_ABSOLUTE_MADE_RELATIVE RELATIVE_ROOT ".." SEP_STR TEXT_PATH_ITEM
 #define TEXT_PATH_RELATIVE RELATIVE_ROOT TEXT_PATH_ITEM
 #define TEXT_PATH_RELATIVE_MADE_ABSOLUTE BASE_DIR TEXT_PATH_ITEM
 
 #define MOVIECLIP_PATH_ITEM "movieclips" SEP_STR "movieclip.avi"
 #define MOVIECLIP_PATH_ABSOLUTE ABSOLUTE_ROOT MOVIECLIP_PATH_ITEM
-#define MOVIECLIP_PATH_ABSOLUTE_MADE_RELATIVE RELATIVE_ROOT ".." MOVIECLIP_PATH_ABSOLUTE
+#define MOVIECLIP_PATH_ABSOLUTE_MADE_RELATIVE RELATIVE_ROOT ".." SEP_STR MOVIECLIP_PATH_ITEM
 #define MOVIECLIP_PATH_RELATIVE RELATIVE_ROOT MOVIECLIP_PATH_ITEM
 #define MOVIECLIP_PATH_RELATIVE_MADE_ABSOLUTE BASE_DIR MOVIECLIP_PATH_ITEM



More information about the Bf-blender-cvs mailing list