diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
| commit | 32c7e22d3696e3575f4b7d05c1f7140591e88809 (patch) | |
| tree | 44d501cb62aebd638a7f7b5d0306ecc03e0deb5f /source/blender/freestyle/intern/blender_interface | |
| parent | dfcd01553536d63dab1037d0ea289b9d9d90c39c (diff) | |
| parent | 6fb82a85c9a48c9fad6cb7b42994a9cd7b2b491a (diff) | |
Merged changes in the trunk up to revision 37388.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 7d52b92f7c6..c2d190d9ff1 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -65,7 +65,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render* re, int render_count) freestyle_scene->r.border.ymin= old_scene->r.border.ymin; freestyle_scene->r.border.xmax= old_scene->r.border.xmax; freestyle_scene->r.border.ymax= old_scene->r.border.ymax; - strcpy(freestyle_scene->r.backbuf, old_scene->r.backbuf); strcpy(freestyle_scene->r.pic, old_scene->r.pic); freestyle_scene->r.safety.xmin= old_scene->r.safety.xmin; freestyle_scene->r.safety.ymin= old_scene->r.safety.ymin; |