forked from bartvdbraak/blender
Added a new internal header for implicit solver defines.
Should become its own intern wrapper library eventually.
This commit is contained in:
parent
7896827f75
commit
8283122cda
@ -107,6 +107,7 @@ set(SRC
|
||||
intern/idprop.c
|
||||
intern/image.c
|
||||
intern/image_gen.c
|
||||
intern/implicit.h
|
||||
intern/implicit.c
|
||||
intern/implicit_eigen.cpp
|
||||
intern/ConstrainedConjugateGradient.h # XXX move this to a better place
|
||||
|
@ -29,7 +29,7 @@
|
||||
* \ingroup bke
|
||||
*/
|
||||
|
||||
//#define IMPLICIT_SOLVER_BLENDER
|
||||
#include "implicit.h"
|
||||
|
||||
#ifdef IMPLICIT_SOLVER_BLENDER
|
||||
|
||||
@ -50,7 +50,6 @@
|
||||
#include "BKE_effect.h"
|
||||
#include "BKE_global.h"
|
||||
|
||||
|
||||
#ifdef __GNUC__
|
||||
# pragma GCC diagnostic ignored "-Wtype-limits"
|
||||
#endif
|
||||
|
38
source/blender/blenkernel/intern/implicit.h
Normal file
38
source/blender/blenkernel/intern/implicit.h
Normal file
@ -0,0 +1,38 @@
|
||||
/*
|
||||
* ***** 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) Blender Foundation
|
||||
* All rights reserved.
|
||||
*
|
||||
* The Original Code is: all of this file.
|
||||
*
|
||||
* Contributor(s): Lukas Toenne
|
||||
*
|
||||
* ***** END GPL LICENSE BLOCK *****
|
||||
*/
|
||||
|
||||
#ifndef __BKE_IMPLICIT_H__
|
||||
#define __BKE_IMPLICIT_H__
|
||||
|
||||
/** \file implicit.h
|
||||
* \ingroup bke
|
||||
*/
|
||||
|
||||
#define IMPLICIT_SOLVER_EIGEN
|
||||
//#define IMPLICIT_SOLVER_BLENDER
|
||||
|
||||
#endif
|
@ -29,13 +29,13 @@
|
||||
* \ingroup bke
|
||||
*/
|
||||
|
||||
#define IMPLICIT_SOLVER_EIGEN
|
||||
#include "implicit.h"
|
||||
|
||||
#ifdef IMPLICIT_SOLVER_EIGEN
|
||||
|
||||
//#define USE_EIGEN_CORE
|
||||
#define USE_EIGEN_CONSTRAINED_CG
|
||||
|
||||
#ifdef IMPLICIT_SOLVER_EIGEN
|
||||
|
||||
#include <Eigen/Sparse>
|
||||
#include <Eigen/src/Core/util/DisableStupidWarnings.h>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user