Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorSebastián Barschkis <sebbas@sebbas.org>2021-09-06 18:17:31 +0300
committerSebastián Barschkis <sebbas@sebbas.org>2021-09-06 18:30:30 +0300
commit3e23af4c4915f1ea5cb61c60e58cdfba41df1b04 (patch)
tree783959d501fae16d56670af04cdba6ca88e07daf /extern
parenta3ca973dec752687dbbf5c3b24b51404ddfdf614 (diff)
Fluid: Clang-format cleanups
Just cleanup.
Diffstat (limited to 'extern')
-rw-r--r--extern/mantaflow/UPDATE.sh2
-rw-r--r--extern/mantaflow/helper/pwrapper/pconvert.cpp6
-rw-r--r--extern/mantaflow/helper/pwrapper/pvec3.cpp6
-rw-r--r--extern/mantaflow/helper/pwrapper/registry.cpp3
-rw-r--r--extern/mantaflow/preprocessed/gitinfo.h2
5 files changed, 12 insertions, 7 deletions
diff --git a/extern/mantaflow/UPDATE.sh b/extern/mantaflow/UPDATE.sh
index aed4e2a9b71..1158ff13455 100644
--- a/extern/mantaflow/UPDATE.sh
+++ b/extern/mantaflow/UPDATE.sh
@@ -8,7 +8,7 @@
# YOUR INSTALLATION PATHS GO HERE:
MANTA_INSTALLATION=/Users/sebbas/Developer/Mantaflow/mantaflowDevelop
-BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender/fluid-mantaflow
+BLENDER_INSTALLATION=/Users/sebbas/Developer/Blender
# Try to check out Mantaflow repository before building?
CLEAN_REPOSITORY=0
diff --git a/extern/mantaflow/helper/pwrapper/pconvert.cpp b/extern/mantaflow/helper/pwrapper/pconvert.cpp
index 7c66cdc7e72..5a7a32c5a73 100644
--- a/extern/mantaflow/helper/pwrapper/pconvert.cpp
+++ b/extern/mantaflow/helper/pwrapper/pconvert.cpp
@@ -28,11 +28,13 @@ extern PyTypeObject PbVec3Type;
extern PyTypeObject PbVec4Type;
struct PbVec3 {
- PyObject_HEAD float data[3];
+ PyObject_HEAD
+ float data[3];
};
struct PbVec4 {
- PyObject_HEAD float data[4];
+ PyObject_HEAD
+ float data[4];
};
PyObject *getPyNone()
diff --git a/extern/mantaflow/helper/pwrapper/pvec3.cpp b/extern/mantaflow/helper/pwrapper/pvec3.cpp
index 1dca44d5e5c..4d07a201cfe 100644
--- a/extern/mantaflow/helper/pwrapper/pvec3.cpp
+++ b/extern/mantaflow/helper/pwrapper/pvec3.cpp
@@ -25,7 +25,8 @@ namespace Manta {
extern PyTypeObject PbVec3Type;
struct PbVec3 {
- PyObject_HEAD float data[3];
+ PyObject_HEAD
+ float data[3];
};
static void PbVec3Dealloc(PbVec3 *self)
@@ -293,7 +294,8 @@ inline PyObject *castPy(PyTypeObject *p)
extern PyTypeObject PbVec4Type;
struct PbVec4 {
- PyObject_HEAD float data[4];
+ PyObject_HEAD
+ float data[4];
};
static PyMethodDef PbVec4Methods[] = {
diff --git a/extern/mantaflow/helper/pwrapper/registry.cpp b/extern/mantaflow/helper/pwrapper/registry.cpp
index f88c2aa708e..5196c0409f8 100644
--- a/extern/mantaflow/helper/pwrapper/registry.cpp
+++ b/extern/mantaflow/helper/pwrapper/registry.cpp
@@ -76,7 +76,8 @@ struct ClassData {
};
struct PbObject {
- PyObject_HEAD Manta::PbClass *instance;
+ PyObject_HEAD
+ Manta::PbClass *instance;
ClassData *classdef;
};
diff --git a/extern/mantaflow/preprocessed/gitinfo.h b/extern/mantaflow/preprocessed/gitinfo.h
index 6bc92278a33..6d367b764af 100644
--- a/extern/mantaflow/preprocessed/gitinfo.h
+++ b/extern/mantaflow/preprocessed/gitinfo.h
@@ -1,3 +1,3 @@
-#define MANTA_GIT_VERSION "commit 8fbebe02459b7f72575872c20961f7cb757db408"
+#define MANTA_GIT_VERSION "commit d5d9a6c28daa8f21426d7a285f48639c0d8fd13f"