[Bf-blender-cvs] [b211885d0f2] lanpr-under-gp: LANPR: Remove chaining flag.
YimingWu
noreply at git.blender.org
Sun Jun 7 16:29:11 CEST 2020
Commit: b211885d0f2063e611e8a994381062da7735cd20
Author: YimingWu
Date: Sun Jun 7 20:50:27 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBb211885d0f2063e611e8a994381062da7735cd20
LANPR: Remove chaining flag.
===================================================================
M release/scripts/startup/bl_ui/properties_render.py
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/include/ED_lanpr.h
M source/blender/editors/lanpr/lanpr_cpu.c
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 7a464606c42..c9976ce8dd9 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -758,10 +758,6 @@ class RENDER_PT_lanpr_layer_settings(RenderButtonsPanel, Panel):
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_OPENGL', 'BLENDER_EEVEE'}
- @classmethod
- def poll(cls, context):
- return True
-
def draw(self, context):
scene = context.scene
lanpr = scene.lanpr
@@ -802,10 +798,6 @@ class RENDER_PT_lanpr_line_normal_effects(RenderButtonsPanel, Panel):
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_OPENGL', 'BLENDER_EEVEE'}
- @classmethod
- def poll(cls, context):
- return True
-
def draw_header(self, context):
active_layer = context.scene.lanpr.layers.active_layer
self.layout.prop(active_layer, "normal_enabled", text="")
@@ -872,7 +864,6 @@ class RENDER_PT_lanpr_options(RenderButtonsPanel, Panel):
layout.use_property_decorate = False
layout.prop(lanpr,"use_intersections")
- layout.prop(lanpr,"enable_chaining", text = "Chained Lines")
class RENDER_PT_lanpr_software_chain_styles(RenderButtonsPanel, Panel):
@@ -881,12 +872,6 @@ class RENDER_PT_lanpr_software_chain_styles(RenderButtonsPanel, Panel):
bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_LANPR', 'BLENDER_OPENGL', 'BLENDER_EEVEE'}
- @classmethod
- def poll(cls, context):
- scene = context.scene
- lanpr = scene.lanpr
- return scene.render.engine!='BLENDER_LANPR' or lanpr.enable_chaining and (not (scene.render.engine=='BLENDER_LANPR' and lanpr.master_mode=='DPIX'))
-
def draw(self, context):
scene = context.scene
lanpr = scene.lanpr
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index bf3510dced7..3bb48fb476c 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4427,7 +4427,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
scene->lanpr.crease_threshold = 0.7;
- scene->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
+ scene->lanpr.flags |= (LANPR_USE_INTERSECTIONS);
zero_v4(scene->lanpr.line_color);
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 8d646ffd1e6..0b014f5fa51 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -518,9 +518,11 @@ int ED_lanpr_point_inside_triangled(double v[2], double v0[2], double v1[2], dou
struct Depsgraph;
struct SceneLANPR;
+struct Scene;
+struct LANPR_RenderBuffer;
void ED_lanpr_init_locks(void);
-
+struct LANPR_RenderBuffer *ED_lanpr_create_render_buffer(struct Scene *s);
void ED_lanpr_destroy_render_data(void);
int ED_lanpr_object_collection_usage_check(struct Collection *c, struct Object *o);
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index b35936e5f16..4ec6d6ac36c 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -3743,8 +3743,8 @@ int ED_lanpr_compute_feature_lines_internal(Depsgraph *depsgraph, const int inte
ED_lanpr_update_render_progress("LANPR: Chaining.");
- /* When not using LANPR engine, chaining is forced in order to generate data for GPencil. */
- if ((lanpr->flags & LANPR_USE_CHAINING) && (!intersectons_only)) {
+ /* intersection_only is preserved for furure functions.*/
+ if (!intersectons_only) {
float t_image = s->lanpr.chaining_image_threshold;
float t_geom = s->lanpr.chaining_geometry_threshold;
@@ -3908,7 +3908,6 @@ static void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
Collection *col,
int types)
{
- Scene *scene = DEG_get_evaluated_scene(depsgraph);
LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared;
if (rb == NULL) {
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 4f65cfec64b..df449e664af 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1706,7 +1706,7 @@ typedef enum LANPR_MainFlags {
LANPR_SAME_TAPER = (1 << 2),
/* Edge split modifier will cause problems in LANPR. */
LANPR_DISABLE_EDGE_SPLITS = (1 << 3),
- LANPR_USE_CHAINING = (1 << 4),
+ LANPR_USE_CHAINING = (1 << 4), /* Deprecated */
LANPR_USE_INTERSECTIONS = (1 << 5),
/* Overwrite existing strokes in this frame. */
LANPR_GPENCIL_OVERWRITE = (1 << 6),
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 962ab1c7d83..2d133c546c0 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7402,12 +7402,6 @@ static void rna_def_scene_lanpr(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Calculate Intersections", "Calculate Intersections or not");
RNA_def_property_update(prop, NC_SCENE, NULL);
- prop = RNA_def_property(srna, "enable_chaining", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flags", LANPR_USE_CHAINING);
- RNA_def_property_boolean_default(prop, 1);
- RNA_def_property_ui_text(prop, "Enable Chaining", "Chain Feature Lines After Occlusion Test");
- RNA_def_property_update(prop, NC_SCENE, NULL);
-
/* Below these two are only for grease pencil, thus no viewport updates. */
prop = RNA_def_property(srna, "chaining_geometry_threshold", PROP_FLOAT, PROP_NONE);
More information about the Bf-blender-cvs
mailing list