diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-20 18:56:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-20 18:56:12 +0300 |
| commit | 77a4d705c7fe8bafd3dd891905dddceea2e5b314 (patch) | |
| tree | 9e0a669e355b34338425221b7b447f2f8ede3eb2 /source/blender/render/intern/include/render_types.h | |
| parent | f808f36c12317219669f9572712fc5dd485251e7 (diff) | |
| parent | b9dc4f851bd01a5ca5c7019ea7ef2356d010be5f (diff) | |
Merge branch 'master' into temp-ghash-setops
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
| -rw-r--r-- | source/blender/render/intern/include/render_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 8d92fb9eec9..a53ff302475 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -194,6 +194,7 @@ struct Render struct Object *camera_override; unsigned int lay, layer_override; + ThreadRWMutex partsmutex; ListBase parts; /* render engine */ |