Commit: 4d7d0b60d1f54219166c618d72d7725ccb058f59 Author: Nick Wu Date: Thu Aug 9 15:41:10 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4d7d0b60d1f54219166c618d72d7725ccb058f59
Modified UI for background color display and line layer on DPIX. Added console warning for software rendering. =================================================================== M release/scripts/startup/bl_ui/properties_scene.py M source/blender/draw/engines/lanpr/lanpr_ops.c =================================================================== diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 858b04f1fcf..8fbf1631c1d 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -644,11 +644,10 @@ class SCENE_PT_lanpr(SceneButtonsPanel, Panel): layout.prop(lanpr, "master_mode", expand=True) if lanpr.master_mode == "DPIX" or lanpr.master_mode == "SOFTWARE": - if lanpr.master_mode == "DPIX": - layout.prop(lanpr, "reloaded") + + layout.prop(lanpr, "background_color") if lanpr.master_mode == "SOFTWARE": - layout.prop(lanpr, "background_color") layout.label(text="Enable On Demand:") row = layout.row() row.prop(lanpr,"enable_intersections", text = "Intersection Lines") @@ -680,12 +679,6 @@ class SCENE_PT_lanpr(SceneButtonsPanel, Panel): layout.label(text="Vectorization:") layout.prop(lanpr, "enable_vector_trace", expand = True) - #col = layout.column() - #col.label(text="Enable:") - #row = col.row(align=True) - #row.prop(lanpr, "enable_edge_mark", text="Mark", toggle=True) - #row.prop(lanpr, "enable_material_seperate", text="Material", toggle=True) - class SCENE_PT_lanpr_line_types(SceneButtonsPanel, Panel): bl_label = "Types" @@ -704,6 +697,8 @@ class SCENE_PT_lanpr_line_types(SceneButtonsPanel, Panel): scene = context.scene lanpr = scene.lanpr active_layer = lanpr.layers.active_layer + if active_layer and lanpr.master_mode == "DPIX": + active_layer = lanpr.layers[0] layout.operator("scene.lanpr_enable_all_line_types") diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c index 0916c2a7065..5d37e903ecb 100644 --- a/source/blender/draw/engines/lanpr/lanpr_ops.c +++ b/source/blender/draw/engines/lanpr/lanpr_ops.c @@ -3018,7 +3018,10 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render) lanpr_rebuild_all_command(lanpr); } else { - if (lanpr_during_render()) return; // don't draw viewport during render + if (lanpr_during_render()) { + printf("LANPR Warning: To avoid resource duplication, viewport will not display when rendering is in progress\n"); + return; // don't draw viewport during render + } } float clear_col[4] = { 1.0f, 0.0f, 0.0f, 1.0f }; @@ -3174,6 +3177,7 @@ static int lanpr_compute_feature_lines_exec(struct bContext *C, struct wmOperato if (!scene->camera) { BKE_report(op->reports, RPT_ERROR, "There is no active camera in this scene!"); + printf("LANPR Warning: There is no active camera in this scene!\n"); return OPERATOR_FINISHED; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs