Commit: 7cafdc57e06d675061ec40cfaba03c2af1f58122 Author: Sebastián Barschkis Date: Wed Apr 8 13:20:18 2020 +0200 Branches: master https://developer.blender.org/rB7cafdc57e06d675061ec40cfaba03c2af1f58122
Fluid: Manta clang-format update Do not use sort-includes in Manta source files for now when applying clang-format. Too many conflicts. =================================================================== M extern/mantaflow/UPDATE.sh =================================================================== diff --git a/extern/mantaflow/UPDATE.sh b/extern/mantaflow/UPDATE.sh index 0db18d03094..3feb1ba9226 100644 --- a/extern/mantaflow/UPDATE.sh +++ b/extern/mantaflow/UPDATE.sh @@ -71,7 +71,7 @@ rm $BLENDER_INSTALLATION/blender/tmp/preprocessed/fileio/*.reg cd $BLENDER_INSTALLATION/blender/tmp/ echo "Applying clang format to Mantaflow source files" -find . -iname *.h -o -iname *.cpp | xargs clang-format --verbose -i -style=file +find . -iname *.h -o -iname *.cpp | xargs clang-format --verbose -i -style=file -sort-includes=0 find . -iname *.h -o -iname *.cpp | xargs dos2unix --verbose # ==================== 5) MOVE MANTAFLOW FILES TO EXTERN/ ================================ _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
