[Bf-blender-cvs] [f564cda0795] temp-lineart-contained: Cleanup more unused variables and functions
Sebastian Parborg
noreply at git.blender.org
Fri Feb 12 01:42:16 CET 2021
Commit: f564cda0795084cc66c3e2239bd17337d7922619
Author: Sebastian Parborg
Date: Fri Feb 12 01:41:58 2021 +0100
Branches: temp-lineart-contained
https://developer.blender.org/rBf564cda0795084cc66c3e2239bd17337d7922619
Cleanup more unused variables and functions
===================================================================
M source/blender/gpencil_modifiers/intern/lineart/ED_lineart.h
M source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M source/blender/makesdna/DNA_lineart_types.h
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/lineart/ED_lineart.h b/source/blender/gpencil_modifiers/intern/lineart/ED_lineart.h
index 39b12ad16b6..738274e0c1b 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/ED_lineart.h
+++ b/source/blender/gpencil_modifiers/intern/lineart/ED_lineart.h
@@ -210,9 +210,6 @@ typedef struct LineartRenderBuffer {
double width_per_tile, height_per_tile;
double view_projection[4][4];
- int output_mode;
- int output_aa_level;
-
struct LineartBoundingArea *initial_bounding_areas;
unsigned int bounding_area_count;
@@ -229,8 +226,6 @@ typedef struct LineartRenderBuffer {
ListBase wasted_cuts;
SpinLock lock_cuts;
- struct Material *material_pointers[2048];
-
/* Render status */
double view_vector[3];
@@ -296,32 +291,8 @@ typedef struct LineartRenderBuffer {
float chaining_image_threshold;
float chaining_geometry_threshold;
float angle_splitting_threshold;
-
- /** For showing the progress with mouse cursor and stuff. */
- wmWindow *main_window;
} LineartRenderBuffer;
-typedef enum eLineartRenderStatus {
- LRT_RENDER_IDLE = 0,
- LRT_RENDER_RUNNING = 1,
- LRT_RENDER_INCOMPELTE = 2, /* Not used yet. */
- LRT_RENDER_FINISHED = 3,
- LRT_RENDER_CANCELING = 4,
-} eLineartRenderStatus;
-
-typedef enum eLineartInitStatus {
- LRT_INIT_ENGINE = (1 << 0),
- LRT_INIT_LOCKS = (1 << 1),
-} eLineartInitStatus;
-
-typedef enum eLineartModifierSyncStatus {
- LRT_SYNC_IDLE = 0,
- LRT_SYNC_WAITING = 1,
- LRT_SYNC_FRESH = 2,
- LRT_SYNC_IGNORE = 3,
- LRT_SYNC_CLEARING = 4,
-} eLineartModifierSyncStatus;
-
#define DBL_TRIANGLE_LIM 1e-8
#define DBL_EDGE_LIM 1e-9
@@ -533,7 +504,6 @@ struct Scene;
struct LineartRenderBuffer;
struct LineartGpencilModifierData;
-void ED_lineart_init_locks(void);
struct LineartRenderBuffer *ED_lineart_create_render_buffer(
struct Scene *s, struct LineartGpencilModifierData *lmd);
void ED_lineart_destroy_render_data(struct LineartGpencilModifierData *lmd);
@@ -549,12 +519,6 @@ void ED_lineart_chain_split_angle(LineartRenderBuffer *rb, float angle_threshold
int ED_lineart_chain_count(const LineartRenderLineChain *rlc);
void ED_lineart_chain_clear_picked_flag(struct LineartRenderBuffer *rb);
-void ED_lineart_modifier_sync_flag_set(eLineartModifierSyncStatus flag, bool is_from_modifier);
-bool ED_lineart_modifier_sync_flag_check(eLineartModifierSyncStatus flag);
-void ED_lineart_modifier_sync_add_customer(void);
-void ED_lineart_modifier_sync_remove_customer(void);
-bool ED_lineart_modifier_sync_still_has_customer(void);
-
int ED_lineart_compute_feature_lines_internal(struct Depsgraph *depsgraph,
struct LineartGpencilModifierData *lmd);
@@ -613,19 +577,11 @@ void ED_lineart_gpencil_generate_with_type(LineartRenderBuffer *rb,
const char *vgname,
int modifier_flags);
-struct bContext;
-
-void ED_lineart_post_frame_update_external(struct bContext *C,
- struct Scene *s,
- struct Depsgraph *dg,
- bool from_modifier);
-
float ED_lineart_chain_compute_length(LineartRenderLineChain *rlc);
struct wmOperatorType;
/* Operator types */
-void SCENE_OT_lineart_update_strokes(struct wmOperatorType *ot);
void SCENE_OT_lineart_bake_strokes(struct wmOperatorType *ot);
void ED_operatortypes_lineart(void);
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 19a757bece1..8d36308327b 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -1714,8 +1714,6 @@ static void lineart_main_load_geometries(
double proj[4][4], view[4][4], result[4][4];
float inv[4][4];
- memset(rb->material_pointers, 0, sizeof(void *) * 2048);
-
Camera *cam = camera->data;
float sensor = BKE_camera_sensor_size(cam->sensor_fit, cam->sensor_x, cam->sensor_y);
double fov = focallength_to_fov(cam->lens, sensor);
diff --git a/source/blender/makesdna/DNA_lineart_types.h b/source/blender/makesdna/DNA_lineart_types.h
index 88e620c93a4..2eb36cfb9d3 100644
--- a/source/blender/makesdna/DNA_lineart_types.h
+++ b/source/blender/makesdna/DNA_lineart_types.h
@@ -48,9 +48,7 @@ typedef enum eLineartMainFlags {
LRT_ALLOW_DUPLI_OBJECTS = (1 << 2),
LRT_ALLOW_OVERLAPPING_EDGES = (1 << 3),
LRT_ALLOW_CLIPPING_BOUNDARIES = (1 << 4),
- LRT_BAKING_FINAL_RANGE = (1 << 5),
- LRT_BAKING_KEYFRAMES_ONLY = (1 << 6),
- LRT_REMOVE_DOUBLES = (1 << 7),
+ LRT_REMOVE_DOUBLES = (1 << 5),
} eLineartMainFlags;
typedef enum eLineartEdgeFlag {
More information about the Bf-blender-cvs
mailing list