[Bf-blender-cvs] [1222a08fcaf] temp-lineart-contained: Merge remote-tracking branch 'origin/lanpr-under-gp' into temp-lineart-contained
YimingWu
noreply at git.blender.org
Sat Dec 19 06:18:55 CET 2020
Commit: 1222a08fcaf63ba523341494d328312040fb933f
Author: YimingWu
Date: Sat Dec 19 12:55:33 2020 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rB1222a08fcaf63ba523341494d328312040fb933f
Merge remote-tracking branch 'origin/lanpr-under-gp' into temp-lineart-contained
# Conflicts:
# extern/ceres/README.blender
# release/scripts/startup/bl_ui/space_userpref.py
# source/blender/blenkernel/BKE_gpencil_curve.h
# source/blender/blenkernel/BKE_gpencil_geom.h
# source/blender/blenkernel/BKE_layer.h
# source/blender/blenkernel/BKE_screen.h
# source/blender/blenkernel/intern/gpencil_curve.c
# source/blender/blenkernel/intern/layer_utils.c
# source/blender/blenloader/intern/versioning_290.c
# source/blender/draw/engines/overlay/shaders/edit_curve_point_vert.glsl
# source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl
# source/blender/editors/gpencil/annotate_paint.c
# source/blender/editors/gpencil/gpencil_convert.c
# source/blender/editors/gpencil/gpencil_edit.c
# source/blender/editors/gpencil/gpencil_intern.h
# source/blender/editors/gpencil/gpencil_interpolate.c
# source/blender/editors/gpencil/gpencil_merge.c
# source/blender/editors/gpencil/gpencil_mesh.c
# source/blender/editors/gpencil/gpencil_paint.c
# source/blender/editors/gpencil/gpencil_select.c
# source/blender/editors/gpencil/gpencil_trace_ops.c
# source/blender/editors/gpencil/gpencil_utils.c
# source/blender/editors/interface/interface_panel.c
# source/blender/editors/physics/physics_pointcache.c
# source/blender/editors/space_buttons/buttons_context.c
# source/blender/editors/space_outliner/space_outliner.c
# source/blender/editors/space_view3d/view3d_placement.c
# source/blender/makesdna/DNA_userdef_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/blender/makesrna/intern/rna_space.c
# source/blender/python/gpu/gpu_py_shader.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_gpencil.h
index 40e3fa70752,f49e392792e..6af92ef0010
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@@ -46,9 -46,7 +46,8 @@@ struct bGPDcurve
struct bGPDframe;
struct bGPDlayer;
struct bGPDlayer_Mask;
- struct bGPDspoint;
struct bGPDstroke;
+struct bGPDcurve;
struct bGPdata;
#define GPENCIL_SIMPLIFY(scene) ((scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE))
diff --cc source/blender/blenloader/intern/versioning_290.c
index ec39113c4d0,d008e740f6e..86293f273b3
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1166,5 -1449,17 +1449,6 @@@ void blo_do_versions_290(FileData *fd,
}
}
}
+ FOREACH_NODETREE_END;
-
- if (!DNA_struct_find(fd->filesdna, "SceneLineArt")) {
- LISTBASE_FOREACH (Scene *, sc, &bmain->scenes) {
- sc->lineart.crease_threshold = DEG2RAD(140.0f);
- sc->lineart.line_types |= LRT_EDGE_FLAG_ALL_TYPE;
- sc->lineart.flags |= (LRT_ALLOW_DUPLI_OBJECTS | LRT_REMOVE_DOUBLES);
- sc->lineart.angle_splitting_threshold = DEG2RAD(60.0f);
- sc->lineart.chaining_geometry_threshold = 0.001f;
- sc->lineart.chaining_image_threshold = 0.001f;
- }
- }
}
}
diff --cc source/blender/blenloader/intern/writefile.c
index 11fe240620a,c323647053b..0a4f2fde93f
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -93,7 -93,9 +93,8 @@@
/* allow writefile to use deprecated functionality (for forward compatibility code) */
#define DNA_DEPRECATED_ALLOW
+ #include "DNA_collection_types.h"
#include "DNA_fileglobal_types.h"
-#include "DNA_lineart_types.h"
#include "DNA_genfile.h"
#include "DNA_sdna_types.h"
diff --cc source/blender/editors/space_api/spacetypes.c
index 10ce7b81954,a4e188f642c..10fa2c19919
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@@ -64,8 -65,13 +65,9 @@@
#include "ED_space_api.h"
#include "ED_transform.h"
#include "ED_userpref.h"
+ #include "ED_util.h"
#include "ED_uvedit.h"
-#ifdef WITH_LINEART
-# include "ED_lineart.h"
-#endif
-
#include "io_ops.h"
/* only call once on startup, storage is global in BKE kernel listbase */
diff --cc source/blender/makesdna/DNA_gpencil_modifier_types.h
index 227f547f6b9,65972b07d0d..aebaad6c7e1
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@@ -849,27 -854,13 +854,31 @@@ typedef struct LineartGpencilModifierDa
unsigned char transparency_flags; /* eLineartGpencilTransparencyFlags */
unsigned char transparency_mask;
+ /** 0-1 range for cosine angle */
+ float crease_threshold;
+
+ /** 0-PI angle, for splitting strokes at sharp points */
+ float angle_splitting_threshold;
+
+ /* CPU mode */
+ float chaining_geometry_threshold;
+ float chaining_image_threshold;
+
float pre_sample_length;
- /* Additional Switches */
+ /* Ported from SceneLineArt flags. */
+ int calculation_flags;
+
+ /* Additional Switches. */
int flags;
+ int _pad;
+
+ /* Runtime only. */
+ void *render_buffer;
+
} LineartGpencilModifierData;
+
+ #ifdef __cplusplus
+ }
+ #endif
diff --cc source/blender/makesdna/DNA_gpencil_types.h
index 84dacb7fcec,c2c0eed3e14..fb3ad356a51
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@@ -27,9 -27,13 +27,14 @@@
#include "DNA_brush_types.h"
#include "DNA_listBase.h"
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
struct AnimData;
+ struct Curve;
struct MDeformVert;
+struct Curve;
#define GP_DEFAULT_PIX_FACTOR 1.0f
#define GP_DEFAULT_GRID_LINES 4
diff --cc source/blender/makesrna/intern/rna_scene.c
index c132c434468,f969f7ef28b..37e7dcf4450
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -7814,8 -8188,13 +7992,8 @@@ void RNA_def_scene(BlenderRNA *brna
/* EEVEE */
prop = RNA_def_property(srna, "eevee", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "SceneEEVEE");
- RNA_def_property_ui_text(prop, "EEVEE", "EEVEE settings for the scene");
+ RNA_def_property_ui_text(prop, "Eevee", "Eevee settings for the scene");
- /* Line Art */
- prop = RNA_def_property(srna, "lineart", PROP_POINTER, PROP_NONE);
- RNA_def_property_struct_type(prop, "SceneLineArt");
- RNA_def_property_ui_text(prop, "Line Art", "Line Art settings for the scene");
-
/* Grease Pencil */
prop = RNA_def_property(srna, "grease_pencil_settings", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "SceneGpencil");
@@@ -7838,6 -8218,8 +8017,7 @@@
rna_def_display_safe_areas(brna);
rna_def_scene_display(brna);
rna_def_scene_eevee(brna);
- rna_def_scene_lineart(brna);
+ rna_def_view_layer_aov(brna);
rna_def_view_layer_eevee(brna);
rna_def_scene_gpencil(brna);
RNA_define_animate_sdna(true);
More information about the Bf-blender-cvs
mailing list