[Bf-blender-cvs] [18754b54b10] lanpr-under-gp: LineArt: Completely remove now obsolete LineLayer structure.
YimingWu
noreply at git.blender.org
Tue Jul 21 11:36:27 CEST 2020
Commit: 18754b54b10e55711303b764f11f5e9946aff46b
Author: YimingWu
Date: Tue Jul 21 17:34:09 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB18754b54b10e55711303b764f11f5e9946aff46b
LineArt: Completely remove now obsolete LineLayer structure.
===================================================================
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/include/ED_lineart.h
M source/blender/editors/lineart/lineart_intern.h
M source/blender/makesdna/DNA_lineart_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_lineart.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 7cf3cf2e667..c048b5f8090 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -224,30 +224,14 @@ static void scene_init_data(ID *id)
static void BKE_lineart_free_everything(Scene *s)
{
SceneLineart *lineart = &s->lineart;
- LineartLineLayer *ll;
-
- while ((ll = BLI_pophead(&lineart->line_layers)) != NULL) {
- MEM_freeN(ll);
- }
+ /* Nothing to free. Reserved for future. */
}
static void BKE_lineart_copy_data(const Scene *from, Scene *to)
{
const SceneLineart *lineart = &from->lineart;
- LineartLineLayer *ll, *new_ll;
-
- to->lineart.line_layers.first = to->lineart.line_layers.last = NULL;
- memset(&to->lineart.line_layers, 0, sizeof(ListBase));
-
- for (ll = lineart->line_layers.first; ll; ll = ll->next) {
- new_ll = MEM_callocN(sizeof(LineartLineLayer), "Copied Line Layer");
- memcpy(new_ll, ll, sizeof(LineartLineLayer));
- new_ll->next = new_ll->prev = NULL;
- new_ll->batch = NULL;
- BLI_addtail(&to->lineart.line_layers, new_ll);
- }
- /* render_buffer now only accessible from lineart_share */
+ /* Line layer removed. Currently nothing to do. Reserved for future. */
}
static void scene_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int flag)
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 8b1cd3d7f62..32b0b433b15 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6268,10 +6268,6 @@ static void lib_link_scene(BlendLibReader *reader, Scene *sce)
}
}
- for (LineartLineLayer *ll = sce->lineart.line_layers.first; ll; ll = ll->next) {
- BLO_read_id_address(reader, sce->id.lib, &ll->normal_control_object);
- }
-
/* Motion Tracking */
BLO_read_id_address(reader, sce->id.lib, &sce->clip);
if (sce->nodetree) {
@@ -6705,13 +6701,6 @@ static void direct_link_scene(BlendDataReader *reader, Scene *sce)
}
EEVEE_lightcache_info_update(&sce->eevee);
- BLO_read_data_address(reader, &sce->lineart.active_layer);
- BLO_read_list(reader, &(sce->lineart.line_layers));
- for (LineartLineLayer *ll = sce->lineart.line_layers.first; ll; ll = ll->next) {
- ll->batch = NULL;
- ll->shgrp = NULL;
- }
-
direct_link_view3dshading(reader, &sce->display.shading);
BLO_read_data_address(reader, &sce->layer_properties);
@@ -10935,12 +10924,6 @@ static void expand_scene(BlendExpander *expander, Scene *sce)
}
}
- for (LineartLineLayer *ll = sce->lineart.line_layers.first; ll; ll = ll->next) {
- if (ll->normal_control_object) {
- BLO_expand(expander, ll->normal_control_object);
- }
- }
-
if (sce->gpd) {
BLO_expand(expander, sce->gpd);
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index d5c7912a450..c2a1fc33a4d 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -5113,14 +5113,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
if (!DNA_struct_find(fd->filesdna, "SceneLineart")) {
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
-
scene->lineart.crease_threshold = 0.7f;
-
scene->lineart.flags |= (LRT_USE_INTERSECTIONS);
-
- zero_v4(scene->lineart.line_color);
-
- scene->lineart.line_color[3] = 1;
}
}
}
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index a8d5fc684e9..258279d9427 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2743,10 +2743,6 @@ static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address)
write_lightcache(writer, sce->eevee.light_cache_data);
}
- /* Line Art Line Layers */
- for (LineartLineLayer *ll = sce->lineart.line_layers.first; ll; ll = ll->next) {
- writestruct(writer->wd, DATA, LineartLineLayer, 1, ll);
- }
write_view3dshading(writer, &sce->display.shading);
/* Freed on doversion. */
diff --git a/source/blender/editors/include/ED_lineart.h b/source/blender/editors/include/ED_lineart.h
index 242c33fcbd4..2db81986005 100644
--- a/source/blender/editors/include/ED_lineart.h
+++ b/source/blender/editors/include/ED_lineart.h
@@ -504,9 +504,6 @@ void ED_lineart_compute_feature_lines_background(struct Depsgraph *dg,
struct Scene;
-int ED_lineart_max_occlusion_in_line_layers(struct SceneLineart *lineart);
-LineartLineLayer *ED_lineart_new_line_layer(struct SceneLineart *lineart);
-
LineartBoundingArea *ED_lineart_get_point_bounding_area(LineartRenderBuffer *rb,
double x,
double y);
@@ -552,9 +549,6 @@ struct SceneLineart;
void ED_lineart_update_render_progress(int nr, const char *info);
-void ED_lineart_calculate_normal_object_vector(LineartLineLayer *ll,
- float *normal_object_direction);
-
float ED_lineart_chain_compute_length(LineartRenderLineChain *rlc);
struct wmOperatorType;
diff --git a/source/blender/editors/lineart/lineart_intern.h b/source/blender/editors/lineart/lineart_intern.h
index 5678e90a3e8..eb8d467996d 100644
--- a/source/blender/editors/lineart/lineart_intern.h
+++ b/source/blender/editors/lineart/lineart_intern.h
@@ -68,7 +68,6 @@ void tmat_make_ortho_matrix_44d(double (*mProjection)[4],
void tmat_make_perspective_matrix_44d(
double (*mProjection)[4], double fFov_rad, double fAspect, double zMin, double zMax);
-int lineart_count_this_line(struct LineartRenderLine *rl, struct LineartLineLayer *ll);
int lineart_count_intersection_segment_count(struct LineartRenderBuffer *rb);
#endif
diff --git a/source/blender/makesdna/DNA_lineart_types.h b/source/blender/makesdna/DNA_lineart_types.h
index 7a6b619cfd9..f57503d9e2d 100644
--- a/source/blender/makesdna/DNA_lineart_types.h
+++ b/source/blender/makesdna/DNA_lineart_types.h
@@ -53,87 +53,13 @@ typedef enum eLineartEdgeFlag {
#define LRT_EDGE_FLAG_ALL_TYPE 0x3f
-typedef enum eLineartTaperSettings {
- LRT_USE_DIFFERENT_TAPER = 0,
- LRT_USE_SAME_TAPER = 1,
-} eLineartTaperSettings;
-
-typedef enum eLineartNomalEffect {
- /* Shouldn't have access to zero value. */
- /* Enable/disable is another flag. */
- LRT_NORMAL_DIRECTIONAL = 1,
- LRT_NORMAL_POINT = 2,
-} eLineartNomalEffect;
-
-typedef enum eLineartComponentMode {
- LRT_COMPONENT_MODE_ALL = 0,
- LRT_COMPONENT_MODE_OBJECT = 1,
- LRT_COMPONENT_MODE_MATERIAL = 2,
- LRT_COMPONENT_MODE_COLLECTION = 3,
-} eLineartComponentMode;
-
-typedef enum eLineartComponentUsage {
- LRT_COMPONENT_INCLUSIVE = 0,
- LRT_COMPONENT_EXCLUSIVE = 1,
-} eLineartComponentUsage;
-
-typedef enum eLineartComponentLogic {
- LRT_COMPONENT_LOGIG_OR = 0,
- LRT_COMPONENT_LOGIC_AND = 1,
-} eLineartComponentLogic;
-
-struct DRWShadingGroup;
-
-typedef struct LineartLineType {
- int use;
- float thickness;
- float color[4];
-} LineartLineType;
-
-typedef enum eLineartLineLayerFlags {
+typedef enum eLineartModeFlags {
LRT_LINE_LAYER_USE_SAME_STYLE = (1 << 0), /* Share with object lineart flags */
LRT_LINE_LAYER_USE_MULTIPLE_LEVELS = (1 << 1), /* Share with object lineart flags */
LRT_LINE_LAYER_NORMAL_ENABLED = (1 << 2),
LRT_LINE_LAYER_NORMAL_INVERSE = (1 << 3),
LRT_LINE_LAYER_REPLACE_STROKES = (1 << 4),
LRT_LINE_LAYER_COLLECTION_FORCE = (1 << 5),
-} eLineartLineLayerFlags;
-
-typedef struct LineartLineLayer {
- struct LineartLineLayer *next, *prev;
-
- int flags;
- int _pad1;
- int level_start;
- int level_end;
-
- /** To be displayed on the list */
- char name[64];
-
- LineartLineType contour;
- LineartLineType crease;
- LineartLineType edge_mark;
- LineartLineType material_separate;
- LineartLineType intersection;
-
- float thickness;
-
- float color[4];
-
- int normal_mode;
- float normal_ramp_begin;
- float normal_ramp_end;
- float normal_thickness_start;
- float normal_thickness_end;
- struct Object *normal_control_object;
-
- /** For component evaluation */
- int logic_mode;
- int _pad3;
-
- struct DRWShadingGroup *shgrp;
- struct GPUBatch *batch;
-
-} LineartLineLayer;
+} eLineartModeFlags;
#endif
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 0505263ad05..46db123196a 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1693,8 +1693,6 @@ typedef struct SceneEEVEE {
/* Line Art Global Config */
-struct LineartLineLayer;
-
typedef enum eLineartPostProcessingStatus {
LRT_POST_PROCESSING_DISABLED = 0,
LRT_POST_PROCESSING_ENABLED = 1,
@@ -1716,23 +1714,14 @@ typedef enum eLineartMainFlags {
typedef struct SceneLineart {
int flags;
+ int _pad;
/* shared */
- float contour_fade; /* for dpix contour fading,reserved for future usage */
- float crease_threshold; /* 0-1 range for cosine angle */
- float crease_fade_threshold; /* for dpix crease fading */
-
- float line_color[4];
-
- float depth_width_influence;
- float depth_width_curve;
- float depth_alpha_influence;
- float depth_alpha_curve;
+ float contour_fade; /* for dpix contour fading,reserved for future usage */
+ float crease_threshold; /* 0-1 range for cosine angle */
/* CPU mode */
- ListBase line_layers;
- struct LineartLineLayer *active_layer;
float chaining_geometry_threshold;
float chaining_image_threshold;
} SceneLineart;
diff --git a/source/blender/makesrna/intern/rna_lineart.c b/source/blender/makesrna/intern/rna_lineart.c
index db1908653d8..fddfb72a7e6 100644
--- a/source/blender/makesrna/intern/rna_lineart.c
+++ b/source/blender/makesrna/intern/rna_lineart.c
@@ -33,160 +33,18 @@
#include "RNA_define.h"
#include "RNA_enum_types.h"
-#include "rna_internal.h"
-
-#include "DN
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list