[Bf-blender-cvs] [838ba727928] soc-2019-npr: LANPR: Fix merge problems.
YimingWu
noreply at git.blender.org
Thu Aug 1 09:32:39 CEST 2019
Commit: 838ba727928b6f9b2eb5559314185eee01d36d06
Author: YimingWu
Date: Thu Aug 1 15:32:22 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB838ba727928b6f9b2eb5559314185eee01d36d06
LANPR: Fix merge problems.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_svg.c
M source/blender/editors/lanpr/lanpr_cpu.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 73cb5f9a09a..b8bb78c9713 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -267,12 +267,6 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
if (is_render) {
lanpr_rebuild_all_command(lanpr);
}
- else {
- 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};
float clear_depth = 1.0f;
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index c9bfae643b7..7403ae94da3 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -646,7 +646,7 @@ struct GP_EditableStrokes_Iter {
#define GP_DERIVED_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) \
{ \
struct GP_EditableStrokes_Iter gpstroke_iter = {{{0}}}; \
- Depsgraph *depsgraph_ = CTX_data_depsgraph(C); \
+ Depsgraph *depsgraph_ = CTX_data_depsgraph_pointer(C); \
Object *obact_ = CTX_data_active_object(C); \
Object *obeval_ = DEG_get_evaluated_object(depsgraph_, obact_); \
bGPdata *gpd_ = CTX_data_gpencil_data(C); \
diff --git a/source/blender/editors/gpencil/gpencil_svg.c b/source/blender/editors/gpencil/gpencil_svg.c
index f2e9813e55b..655a56ff143 100644
--- a/source/blender/editors/gpencil/gpencil_svg.c
+++ b/source/blender/editors/gpencil/gpencil_svg.c
@@ -90,7 +90,7 @@ void GPENCIL_OT_export_svg(wmOperatorType *ot)
ot->poll = gpencil_export_svg_poll;
/* flag */
- ot->flag = OPTYPE_USE_EVAL_DATA;
+ /* ot->flag = OPTYPE_USE_EVAL_DATA; */
/* properties */
/* Should have: facing, layer, visibility, file split... */
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index eff394d47f5..cbbcba8e11b 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -3926,7 +3926,7 @@ static int lanpr_compute_feature_lines_exec(struct bContext *C, struct wmOperato
int intersections_only = (is_lanpr_engine && lanpr->master_mode != LANPR_MASTER_MODE_SOFTWARE);
- result = ED_lanpr_compute_feature_lines_internal(CTX_data_depsgraph(C), intersections_only);
+ result = ED_lanpr_compute_feature_lines_internal(CTX_data_depsgraph_pointer(C), intersections_only);
lanpr_rebuild_all_command(lanpr);
@@ -3991,7 +3991,7 @@ void SCENE_OT_lanpr_export_svg(wmOperatorType *ot)
ot->poll = lanpr_render_buffer_found;
/* flag */
- ot->flag = OPTYPE_USE_EVAL_DATA;
+ /* ot->flag = OPTYPE_USE_EVAL_DATA; */
/* properties */
/* Should have: facing, layer, visibility, file split... */
@@ -4242,7 +4242,7 @@ static void lanpr_update_gp_strokes_actual(Scene *scene, Depsgraph *dg)
static int lanpr_update_gp_strokes_exec(struct bContext *C, struct wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
- Depsgraph *dg = CTX_data_depsgraph(C);
+ Depsgraph *dg = CTX_data_depsgraph_pointer(C);
lanpr_update_gp_strokes_actual(scene, dg);
@@ -4253,7 +4253,7 @@ static int lanpr_update_gp_strokes_exec(struct bContext *C, struct wmOperator *o
static int lanpr_bake_gp_strokes_exec(struct bContext *C, struct wmOperator *UNUSED(op))
{
Scene *scene = CTX_data_scene(C);
- Depsgraph *dg = CTX_data_depsgraph(C);
+ Depsgraph *dg = CTX_data_depsgraph_pointer(C);
SceneLANPR *lanpr = &scene->lanpr;
int frame, current_frame = scene->r.cfra;
int frame_begin = scene->r.sfra;
@@ -4279,7 +4279,7 @@ static int lanpr_bake_gp_strokes_exec(struct bContext *C, struct wmOperator *UNU
static int lanpr_update_gp_target_exec(struct bContext *C, struct wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
- Depsgraph *dg = CTX_data_depsgraph(C);
+ Depsgraph *dg = CTX_data_depsgraph_pointer(C);
SceneLANPR *lanpr = &scene->lanpr;
Object *gpo = CTX_data_active_object(C);
@@ -4305,7 +4305,7 @@ static int lanpr_update_gp_target_exec(struct bContext *C, struct wmOperator *op
static int lanpr_update_gp_source_exec(struct bContext *C, struct wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
- Depsgraph *dg = CTX_data_depsgraph(C);
+ Depsgraph *dg = CTX_data_depsgraph_pointer(C);
SceneLANPR *lanpr = &scene->lanpr;
Object *source_obj = CTX_data_active_object(C);
More information about the Bf-blender-cvs
mailing list