[Bf-blender-cvs] [ba380fc0bf7] master: Fix T78213: Windows 10 Build Errors: Extern_Manaflow error messages
Sebastián Barschkis
noreply at git.blender.org
Wed Jun 24 18:01:44 CEST 2020
Commit: ba380fc0bf7b646d2c5d4832f6111879b3dd3f97
Author: Sebastián Barschkis
Date: Wed Jun 24 18:01:26 2020 +0200
Branches: master
https://developer.blender.org/rBba380fc0bf7b646d2c5d4832f6111879b3dd3f97
Fix T78213: Windows 10 Build Errors: Extern_Manaflow error messages
Kudos to LazyDodo for figuring this out
===================================================================
M extern/mantaflow/helper/util/randomstream.h
M extern/mantaflow/preprocessed/gitinfo.h
===================================================================
diff --git a/extern/mantaflow/helper/util/randomstream.h b/extern/mantaflow/helper/util/randomstream.h
index 35b9c7d8858..6c20ddc6a14 100644
--- a/extern/mantaflow/helper/util/randomstream.h
+++ b/extern/mantaflow/helper/util/randomstream.h
@@ -16,13 +16,13 @@
#ifndef _RANDOMSTREAM_H
#define _RANDOMSTREAM_H
-namespace Manta {
-
#include <iostream>
#include <stdio.h>
#include <time.h>
#include "vectorbase.h"
+namespace Manta {
+
class MTRand {
// Data
public:
diff --git a/extern/mantaflow/preprocessed/gitinfo.h b/extern/mantaflow/preprocessed/gitinfo.h
index ad7ce45cbce..1e96ee26de2 100644
--- a/extern/mantaflow/preprocessed/gitinfo.h
+++ b/extern/mantaflow/preprocessed/gitinfo.h
@@ -1,3 +1,3 @@
-#define MANTA_GIT_VERSION "commit 2c83bddc59cd5140e5dd91b172167a7cba9d4960"
+#define MANTA_GIT_VERSION "commit 6725e6840a906167cc63474a22fc822d9aebf3e7"
More information about the Bf-blender-cvs
mailing list