diff options
Diffstat (limited to 'source/blender/blenkernel/intern/scene.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index e203d32a658..e2da27fc840 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -1173,6 +1173,7 @@ static void scene_blend_read_data(BlendDataReader *reader, ID *id) BKE_curveprofile_blend_read(reader, sce->toolsettings->custom_bevel_profile_preset); } + BLO_read_data_address(reader, &sce->toolsettings->paint_mode.canvas_image); BLO_read_data_address(reader, &sce->toolsettings->sequencer_tool_settings); } @@ -2951,6 +2952,20 @@ int BKE_scene_num_threads(const Scene *scene) return BKE_render_num_threads(&scene->r); } +void BKE_render_resolution(const struct RenderData *r, + const bool use_crop, + int *r_width, + int *r_height) +{ + *r_width = (r->xsch * r->size) / 100; + *r_height = (r->ysch * r->size) / 100; + + if (use_crop && (r->mode & R_BORDER) && (r->mode & R_CROP)) { + *r_width *= BLI_rctf_size_x(&r->border); + *r_height *= BLI_rctf_size_y(&r->border); + } +} + int BKE_render_preview_pixel_size(const RenderData *r) { if (r->preview_pixel_size == 0) { |