Commit: 693cecab701e3f65b78d8eda6e69f01c218f53e2 Author: YimingWu Date: Fri Jul 5 15:57:20 2019 +0800 Branches: soc-2019-npr https://developer.blender.org/rB693cecab701e3f65b78d8eda6e69f01c218f53e2
LANPR: Disable header checkbox when in LANPR engine. =================================================================== M release/scripts/startup/bl_ui/properties_render.py M source/blender/draw/engines/lanpr/lanpr_ops.c =================================================================== diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index fd40b549663..68d4a0b5173 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -729,7 +729,8 @@ class RENDER_PT_lanpr(RenderButtonsPanel, Panel): return True def draw_header(self, context): - self.layout.prop(context.scene.lanpr, "enabled", text="") + if context.scene.render.engine != 'BLENDER_LANPR': + self.layout.prop(context.scene.lanpr, "enabled", text="") def draw(self, context): scene = context.scene diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c index da56830c4e7..1a53f1a1b85 100644 --- a/source/blender/draw/engines/lanpr/lanpr_ops.c +++ b/source/blender/draw/engines/lanpr/lanpr_ops.c @@ -4320,8 +4320,9 @@ int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersectons_ LANPR_RenderBuffer *rb; Scene *s = DEG_get_evaluated_scene(depsgraph); SceneLANPR *lanpr = &s->lanpr; + int is_lanpr_engine = !strcmp(s->r.engine, RE_engine_id_BLENDER_LANPR); - if (!lanpr->enabled) { + if (!is_lanpr_engine && !lanpr->enabled) { return OPERATOR_CANCELLED; } @@ -4358,8 +4359,7 @@ int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, int intersectons_ } /* When not using LANPR engine, chaining is forced in order to generate data for GPencil. */ - if ((lanpr->enable_chaining || strcmp(s->r.engine, RE_engine_id_BLENDER_LANPR)) && - (!intersectons_only)) { + if ((lanpr->enable_chaining || !is_lanpr_engine) && (!intersectons_only)) { lanpr_NO_THREAD_chain_feature_lines(rb); /* should use user_adjustable value */ lanpr_split_chains_for_fixed_occlusion(rb); lanpr_connect_chains(rb, 1); @@ -4389,8 +4389,9 @@ static int lanpr_compute_feature_lines_exec(struct bContext *C, struct wmOperato Scene *scene = CTX_data_scene(C); SceneLANPR *lanpr = &scene->lanpr; int result; + int is_lanpr_engine = !strcmp(scene->r.engine, RE_engine_id_BLENDER_LANPR); - if (!lanpr->enabled) { + if (!is_lanpr_engine && !lanpr->enabled) { return OPERATOR_CANCELLED; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs