diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-11 01:56:23 +0400 |
commit | a2ebfc82dbe954acc432ae017ac62a30a11b6a16 (patch) | |
tree | 8cf8bf458d14a26849dbee6af312ff9361029b90 /source/blender/render/intern/include/render_types.h | |
parent | e9eed190e83eb351aeb435d21287eaf37fcffeb0 (diff) | |
parent | e09ab8883ce0e41add94058ecd4045ac5efa74c6 (diff) |
Merged changes in the trunk up to revision 44797.
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
Diffstat (limited to 'source/blender/render/intern/include/render_types.h')
-rw-r--r-- | source/blender/render/intern/include/render_types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 9337dc63b62..fc64f0a6e1b 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -131,8 +131,8 @@ struct Render /* a list of RenderResults, for fullsample */ ListBase fullresult; /* read/write mutex, all internal code that writes to re->result must use a - write lock, all external code must use a read lock. internal code is assumed - to not conflict with writes, so no lock used for that */ + * write lock, all external code must use a read lock. internal code is assumed + * to not conflict with writes, so no lock used for that */ ThreadRWMutex resultmutex; /* window size, display rect, viewplane */ @@ -149,7 +149,7 @@ struct Render /* real maximum amount of xparts/yparts after correction for minimum */ int xparts, yparts; /* real maximum size of parts after correction for minimum - partx*xparts can be larger than rectx, in that case last part is smaller */ + * partx*xparts can be larger than rectx, in that case last part is smaller */ int partx, party; /* values for viewing */ @@ -231,8 +231,8 @@ struct Render ListBase freestyle_renders; /* arena for allocating data for use during render, for - * example dynamic TFaces to go in the VlakRen structure. - */ + * example dynamic TFaces to go in the VlakRen structure. + */ struct MemArena *memArena; /* callbacks */ |