[Bf-blender-cvs] [8618cd3] gooseberry: Removed unused thread mutex file from pointcache lib.

Lukas Tönne noreply at git.blender.org
Mon Mar 23 13:01:48 CET 2015


Commit: 8618cd39d6e83d5c8e3d24abd6d9787679f9d4c5
Author: Lukas Tönne
Date:   Fri Feb 27 09:38:24 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB8618cd39d6e83d5c8e3d24abd6d9787679f9d4c5

Removed unused thread mutex file from pointcache lib.

===================================================================

M	source/blender/pointcache/CMakeLists.txt
M	source/blender/pointcache/intern/export.cpp
M	source/blender/pointcache/intern/export.h
D	source/blender/pointcache/intern/thread.h

===================================================================

diff --git a/source/blender/pointcache/CMakeLists.txt b/source/blender/pointcache/CMakeLists.txt
index ed8a69c..7e82e56 100644
--- a/source/blender/pointcache/CMakeLists.txt
+++ b/source/blender/pointcache/CMakeLists.txt
@@ -43,7 +43,6 @@ set(SRC
 	intern/ptc_types.cpp
 	intern/reader.h
 	intern/reader.cpp
-	intern/thread.h
 	intern/writer.h
 	intern/writer.cpp
 
diff --git a/source/blender/pointcache/intern/export.cpp b/source/blender/pointcache/intern/export.cpp
index 00636b3..803621f 100644
--- a/source/blender/pointcache/intern/export.cpp
+++ b/source/blender/pointcache/intern/export.cpp
@@ -42,8 +42,6 @@ Exporter::Exporter(Main *bmain, Scene *scene, EvaluationContext *evalctx, short
 
 void Exporter::bake(ListBase *writers, int start_frame, int end_frame)
 {
-//	thread_scoped_lock(m_mutex);
-
 	set_progress(0.0f);
 
 	for (int cfra = start_frame; cfra <= end_frame; ++cfra) {
diff --git a/source/blender/pointcache/intern/export.h b/source/blender/pointcache/intern/export.h
index a0469d4..f67f93c 100644
--- a/source/blender/pointcache/intern/export.h
+++ b/source/blender/pointcache/intern/export.h
@@ -19,8 +19,6 @@
 #ifndef PTC_EXPORT_H
 #define PTC_EXPORT_H
 
-#include "thread.h"
-
 struct Main;
 struct Scene;
 struct EvaluationContext;
@@ -42,8 +40,6 @@ public:
 	void set_progress(float progress);
 
 private:
-	thread_mutex m_mutex;
-	
 	Main *m_bmain;
 	Scene *m_scene;
 	EvaluationContext *m_evalctx;
diff --git a/source/blender/pointcache/intern/thread.h b/source/blender/pointcache/intern/thread.h
deleted file mode 100644
index 229c0f5..0000000
--- a/source/blender/pointcache/intern/thread.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2013, Blender Foundation.
- *
- * 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.
- */
-
-#ifndef PTC_THREAD_H
-#define PTC_THREAD_H
-
-#include <boost/thread.hpp>
-
-namespace PTC {
-
-typedef boost::mutex thread_mutex;
-typedef boost::mutex::scoped_lock thread_scoped_lock;
-
-} /* namespace PTC */
-
-#endif  /* PTC_THREAD_H */




More information about the Bf-blender-cvs mailing list