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
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-01-28 14:47:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-01-28 14:49:45 +0300
commit704b336899dd0a308f9160fa53478d2aaed9f730 (patch)
tree4097de7c0770eb7eb984ec9fb86f273ac423b006 /source/blender/editors/include/ED_info.h
parentcb69a039e74b21ea2d5469b776719fbc9aea45ac (diff)
Make scene statistics to respect locked interface
Interface is being locked when some destructive operations are called from non-main thread. This was causing crash with particles in T60065.
Diffstat (limited to 'source/blender/editors/include/ED_info.h')
-rw-r--r--source/blender/editors/include/ED_info.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h
index 072b1a135a3..8c9dd61a0da 100644
--- a/source/blender/editors/include/ED_info.h
+++ b/source/blender/editors/include/ED_info.h
@@ -27,8 +27,10 @@
#ifndef __ED_INFO_H__
#define __ED_INFO_H__
+struct Main;
+
/* info_stats.c */
void ED_info_stats_clear(struct ViewLayer *view_layer);
-const char *ED_info_stats_string(struct Scene *scene, struct ViewLayer *view_layer);
+const char *ED_info_stats_string(struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer);
#endif /* __ED_INFO_H__ */