[Bf-blender-cvs] [7bd3d2be080] master: Mantaflow [Part 5]: Update other /intern packages
Sebastián Barschkis
noreply at git.blender.org
Mon Dec 16 16:38:03 CET 2019
Commit: 7bd3d2be080720a5b40b6898e6588e937497201f
Author: Sebastián Barschkis
Date: Mon Dec 16 15:51:02 2019 +0100
Branches: master
https://developer.blender.org/rB7bd3d2be080720a5b40b6898e6588e937497201f
Mantaflow [Part 5]: Update other /intern packages
Cycles needs some smaller updates so that the up-res smoke wavelet noise and the liquid mesh speed vector export work correctly.
Reviewed By: mont29
Maniphest Tasks: T59995
Differential Revision: https://developer.blender.org/D3854
===================================================================
D intern/elbeem/CMakeLists.txt
D intern/elbeem/COPYING
D intern/elbeem/COPYING_trimesh2
D intern/elbeem/extern/LBM_fluidsim.h
D intern/elbeem/extern/elbeem.h
D intern/elbeem/intern/attributes.cpp
D intern/elbeem/intern/attributes.h
D intern/elbeem/intern/controlparticles.cpp
D intern/elbeem/intern/controlparticles.h
D intern/elbeem/intern/elbeem.cpp
D intern/elbeem/intern/elbeem_control.cpp
D intern/elbeem/intern/elbeem_control.h
D intern/elbeem/intern/globals.h
D intern/elbeem/intern/isosurface.cpp
D intern/elbeem/intern/isosurface.h
D intern/elbeem/intern/loop_tools.h
D intern/elbeem/intern/mcubes_tables.h
D intern/elbeem/intern/mvmcoords.cpp
D intern/elbeem/intern/mvmcoords.h
D intern/elbeem/intern/ntl_blenderdumper.cpp
D intern/elbeem/intern/ntl_blenderdumper.h
D intern/elbeem/intern/ntl_bsptree.cpp
D intern/elbeem/intern/ntl_bsptree.h
D intern/elbeem/intern/ntl_geometryclass.h
D intern/elbeem/intern/ntl_geometrymodel.cpp
D intern/elbeem/intern/ntl_geometrymodel.h
D intern/elbeem/intern/ntl_geometryobject.cpp
D intern/elbeem/intern/ntl_geometryobject.h
D intern/elbeem/intern/ntl_geometryshader.h
D intern/elbeem/intern/ntl_lighting.cpp
D intern/elbeem/intern/ntl_lighting.h
D intern/elbeem/intern/ntl_matrices.h
D intern/elbeem/intern/ntl_ray.cpp
D intern/elbeem/intern/ntl_ray.h
D intern/elbeem/intern/ntl_vector3dim.h
D intern/elbeem/intern/ntl_world.cpp
D intern/elbeem/intern/ntl_world.h
D intern/elbeem/intern/paraloopend.h
D intern/elbeem/intern/parametrizer.cpp
D intern/elbeem/intern/parametrizer.h
D intern/elbeem/intern/particletracer.cpp
D intern/elbeem/intern/particletracer.h
D intern/elbeem/intern/simulation_object.cpp
D intern/elbeem/intern/simulation_object.h
D intern/elbeem/intern/solver_adap.cpp
D intern/elbeem/intern/solver_class.h
D intern/elbeem/intern/solver_control.cpp
D intern/elbeem/intern/solver_control.h
D intern/elbeem/intern/solver_init.cpp
D intern/elbeem/intern/solver_interface.cpp
D intern/elbeem/intern/solver_interface.h
D intern/elbeem/intern/solver_main.cpp
D intern/elbeem/intern/solver_relax.h
D intern/elbeem/intern/solver_util.cpp
D intern/elbeem/intern/utilities.cpp
D intern/elbeem/intern/utilities.h
D intern/smoke/CMakeLists.txt
D intern/smoke/extern/smoke_API.h
D intern/smoke/intern/EIGENVALUE_HELPER.cpp
D intern/smoke/intern/EIGENVALUE_HELPER.h
D intern/smoke/intern/FFT_NOISE.h
D intern/smoke/intern/FLUID_3D.cpp
D intern/smoke/intern/FLUID_3D.h
D intern/smoke/intern/FLUID_3D_SOLVERS.cpp
D intern/smoke/intern/FLUID_3D_STATIC.cpp
D intern/smoke/intern/IMAGE.h
D intern/smoke/intern/INTERPOLATE.h
D intern/smoke/intern/LICENSE.txt
D intern/smoke/intern/LU_HELPER.cpp
D intern/smoke/intern/LU_HELPER.h
D intern/smoke/intern/MERSENNETWISTER.h
D intern/smoke/intern/Makefile.FFT
D intern/smoke/intern/Makefile.cygwin
D intern/smoke/intern/Makefile.linux
D intern/smoke/intern/Makefile.mac
D intern/smoke/intern/OBSTACLE.h
D intern/smoke/intern/SPHERE.cpp
D intern/smoke/intern/SPHERE.h
D intern/smoke/intern/VEC3.h
D intern/smoke/intern/WAVELET_NOISE.h
D intern/smoke/intern/WTURBULENCE.cpp
D intern/smoke/intern/WTURBULENCE.h
D intern/smoke/intern/smoke_API.cpp
D intern/smoke/intern/tnt/jama_eig.h
D intern/smoke/intern/tnt/jama_lu.h
D intern/smoke/intern/tnt/tnt.h
D intern/smoke/intern/tnt/tnt_array1d.h
D intern/smoke/intern/tnt/tnt_array1d_utils.h
D intern/smoke/intern/tnt/tnt_array2d.h
D intern/smoke/intern/tnt/tnt_array2d_utils.h
D intern/smoke/intern/tnt/tnt_array3d.h
D intern/smoke/intern/tnt/tnt_array3d_utils.h
D intern/smoke/intern/tnt/tnt_cmat.h
D intern/smoke/intern/tnt/tnt_fortran_array1d.h
D intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
D intern/smoke/intern/tnt/tnt_fortran_array2d.h
D intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
D intern/smoke/intern/tnt/tnt_fortran_array3d.h
D intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
D intern/smoke/intern/tnt/tnt_i_refvec.h
D intern/smoke/intern/tnt/tnt_math_utils.h
D intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
D intern/smoke/intern/tnt/tnt_stopwatch.h
D intern/smoke/intern/tnt/tnt_subscript.h
D intern/smoke/intern/tnt/tnt_vec.h
D intern/smoke/intern/tnt/tnt_version.h
===================================================================
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
deleted file mode 100644
index 63a6af84323..00000000000
--- a/intern/elbeem/CMakeLists.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
- extern
- ../guardedalloc
-)
-
-set(INC_SYS
- ${PNG_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIRS}
-)
-
-set(SRC
- intern/attributes.cpp
- intern/controlparticles.cpp
- intern/elbeem.cpp
- intern/elbeem_control.cpp
- intern/isosurface.cpp
- intern/mvmcoords.cpp
- intern/ntl_blenderdumper.cpp
- intern/ntl_bsptree.cpp
- intern/ntl_geometrymodel.cpp
- intern/ntl_geometryobject.cpp
- intern/ntl_lighting.cpp
- intern/ntl_ray.cpp
- intern/ntl_world.cpp
- intern/parametrizer.cpp
- intern/particletracer.cpp
- intern/simulation_object.cpp
- intern/solver_adap.cpp
- intern/solver_control.cpp
- intern/solver_init.cpp
- intern/solver_interface.cpp
- intern/solver_main.cpp
- intern/solver_util.cpp
- intern/utilities.cpp
-
- extern/LBM_fluidsim.h
- extern/elbeem.h
- intern/attributes.h
- intern/controlparticles.h
- intern/elbeem_control.h
- intern/isosurface.h
- intern/loop_tools.h
- intern/mcubes_tables.h
- intern/mvmcoords.h
- intern/ntl_blenderdumper.h
- intern/ntl_bsptree.h
- intern/ntl_geometryclass.h
- intern/ntl_geometrymodel.h
- intern/ntl_geometryobject.h
- intern/ntl_geometryshader.h
- intern/ntl_lighting.h
- intern/ntl_matrices.h
- intern/ntl_ray.h
- intern/ntl_vector3dim.h
- intern/ntl_world.h
- intern/paraloopend.h
- intern/parametrizer.h
- intern/particletracer.h
- intern/simulation_object.h
- intern/solver_class.h
- intern/solver_control.h
- intern/solver_interface.h
- intern/solver_relax.h
- intern/utilities.h
- intern/globals.h
-)
-
-set(LIB
-)
-
-# elbeem has some harmless UNUSED warnings
-remove_strict_flags()
-
-add_definitions(
- -DNOGUI
- -DELBEEM_BLENDER=1
-)
-
-# not essential but quiet gcc's -Wundef
-add_definitions(
- -DLBM_PRECISION=1
- -DLBM_INCLUDE_TESTSOLVERS=0
- -DFSGR_STRICT_DEBUG=0
- -DELBEEM_MPI=0
- -DNEWDIRVELMOTEST=0
-)
-
-if(WIN32)
- # We need BLI_gzopen on win32 for unicode paths
- add_definitions(
- -DLBM_GZIP_OVERRIDE_H="${CMAKE_SOURCE_DIR}/source/blender/blenlib/BLI_fileops.h"
- -D LBM_GZIP_OPEN_FN="\(gzFile\)BLI_gzopen"
- )
-endif()
-
-if(WITH_OPENMP)
- add_definitions(-DPARALLEL=1)
-else()
- add_definitions(-DPARALLEL=0)
-endif()
-
-# Work around hang with GCC and ASAN.
-if(WITH_COMPILER_ASAN)
- if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-sanitize=vptr")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-sanitize=vptr")
- endif()
-endif()
-
-blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/intern/elbeem/COPYING b/intern/elbeem/COPYING
deleted file mode 100644
index 2600c731161..00000000000
--- a/intern/elbeem/COPYING
+++ /dev/null
@@ -1,358 +0,0 @@
- All code distributed as part of El'Beem is covered by the following
- version of the GNU General Public License.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- Copyright (c) 2003-2005 Nils Thuerey. All rights reserved.
-
-
-
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and t
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list