blender
/
blender
135
420
Fork 601
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

Fix #100596: Use sequencer override camera for line art in render #110287

Merged
YimingWu merged 3 commits from ChengduLittleA/blender:fix-100596 into main 2023-09-19 15:27:54 +02:00
Conversation 15 Commits 3 Files Changed 2 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a8125dcef0 - Show all commits

6
source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc
View File

@ -5001,6 +5001,7 @@ bool MOD_lineart_compute_feature_lines(Depsgraph *depsgraph,
t_start = PIL_check_seconds_timer();
}
ChengduLittleA marked this conversation as resolved Outdated
Falk David commented 2023-08-07 18:15:56 +02:00
Outdated
Review
Copy Link

re_override -> use_render_camera_override

`re_override` -> `use_render_camera_override`
bool re_override = false;
if (lmd->calculation_flags & LRT_USE_CUSTOM_CAMERA) {
if (!lmd->source_camera ||
(use_camera = DEG_get_evaluated_object(depsgraph, lmd->source_camera))->type != OB_CAMERA)
@ -5009,10 +5010,10 @@ bool MOD_lineart_compute_feature_lines(Depsgraph *depsgraph,
}
}
else {
ChengduLittleA marked this conversation as resolved Outdated
Falk David commented 2023-08-07 18:02:37 +02:00
Outdated
Review
Copy Link

re -> render

`re` -> `render`
Render *re = RE_GetSceneRender(scene);
if (re && re->camera_override) {
use_camera = DEG_get_evaluated_object(depsgraph, re->camera_override);
re_override = true;
}
if (!use_camera) {
BKE_scene_camera_switch_update(scene);
@ -5026,7 +5027,8 @@ bool MOD_lineart_compute_feature_lines(Depsgraph *depsgraph,
LineartCache *lc = lineart_init_cache();
*cached_result = lc;
ld = lineart_create_render_buffer(scene, lmd, use_camera, scene->camera, lc);
ld = lineart_create_render_buffer(
scene, lmd, use_camera, re_override ? use_camera : scene->camera, lc);
/* Triangle thread testing data size varies depending on the thread count.
* See definition of LineartTriangleThread for details. */