Paths

Table of Contentst

Differential D13402

GPENCIL: merge `master` into branch `temp-gpencil-bezier-stroke-type`
Needs ReviewPublic
Actions

Authored by Shen Ciao (ShenCiao) on Nov 29 2021, 6:49 AM.

Tags

Subscribers

Shen Ciao (ShenCiao)

Tokens

"Pterodactyl" token, awarded by Gavriel5578.

Details

Reviewers

Falk David (filedescriptor)

Summary

Since the diff file of merging commit is too large to upload(173MB), this is the diff file between master and branch after merging.

Most of the conflicts happen due to code clean up. I tried my best to avoid reversing them by referencing newest commit.

The major conflict which worth paying attention is the function in blender\source\blender\blenkernel\intern\gpencil_geom.cc:1575

void BKE_gpencil_stroke_geometry_update(bGPdata *gpd,
                                        bGPDstroke *gps,
                                        const eGPStrokeGeoUpdateFlag flag)

I didn't fully grasp every single detail of it so the modification could be incorrect. And every other appearance of this function, including MOD_gpencildash.c gpencilweight_angle.c, I just attach the GP_GEO_UPDATE_DEFAULT flag onto it.

Diff Detail

Event Timeline

Shen Ciao (ShenCiao) requested review of this revision.Nov 29 2021, 6:49 AM

Shen Ciao (ShenCiao) created this revision.

Gavriel Lavi (Gavriel5578) awarded a token.Dec 2 2021, 12:37 PM

Revision Contents
Changeset List

Path

Size

release/

scripts/

presets/

keyconfig/

keymap_data/

blender_default.py

45 lines

startup/

bl_app_templates_system/

2D_Animation/

4 lines

bl_ui/

properties_data_gpencil.py

5 lines

properties_grease_pencil_common.py

9 lines

space_toolsystem_toolbar.py

19 lines

space_view3d.py

50 lines

space_view3d_toolbar.py

3 lines

source/

blender/

blenkernel/

1 line

BKE_gpencil_curve.h

61 lines

BKE_gpencil_geom.h

70 lines

BKE_gpencil_modifier.h

15 lines

intern/

armature_deform.c

41 lines

29 lines

148 lines

gpencil_curve.c

1619 lines

gpencil_geom.cc

212 lines

gpencil_modifier.c

24 lines

blenloader/

intern/

versioning_280.c

2 lines

versioning_290.c

7 lines

versioning_300.c

13 lines

draw/

engines/

overlay/

overlay_gpencil.c

41 lines

shaders/

edit_gpencil_vert.glsl

15 lines

intern/

draw_cache_impl_gpencil.c

21 lines

editors/

gpencil/

1 line

gpencil_add_monkey.c

56 lines

gpencil_add_stroke.c

2 lines

gpencil_bake_animation.c

2 lines

gpencil_convert.c

1 line

gpencil_curve_draw.c

845 lines

44 lines

2150 lines

gpencil_edit_curve.c

241 lines

2 lines

gpencil_intern.h

15 lines

gpencil_interpolate.c

8 lines

gpencil_merge.c

2 lines

43 lines

gpencil_paint.c

53 lines

gpencil_primitive.c

6 lines

gpencil_sculpt_paint.c

28 lines

gpencil_select.c

1487 lines

gpencil_trace_utils.c

2 lines

gpencil_utils.c

314 lines

8 lines

gpencil_vertex_ops.c

33 lines

gpencil_vertex_paint.c

130 lines

gpencil_weight_paint.c

90 lines

include/

6 lines

screen/

4 lines

transform/

transform_convert_gpencil.c

718 lines

transform_gizmo_3d.c

7 lines

transform_mode_gpopacity.c

12 lines

transform_mode_gpshrinkfatten.c

12 lines

gpencil_modifiers/

intern/

MOD_gpencil_util.c

12 lines

MOD_gpencilarmature.c

86 lines

MOD_gpencilarray.c

57 lines

MOD_gpencilbuild.c

5 lines

MOD_gpencilcolor.c

29 lines

MOD_gpencildash.c

5 lines

MOD_gpencilhook.c

165 lines

MOD_gpencillattice.c

96 lines

MOD_gpencillength.c

33 lines

MOD_gpencillineart.c

3 lines

MOD_gpencilmirror.c

42 lines

MOD_gpencilmultiply.c

5 lines

MOD_gpencilnoise.c

17 lines

MOD_gpenciloffset.c

166 lines

MOD_gpencilopacity.c

29 lines

MOD_gpencilsimplify.c

17 lines

MOD_gpencilsmooth.c

72 lines

MOD_gpencilsubdiv.c

17 lines

MOD_gpenciltexture.c

31 lines

MOD_gpencilthick.c

105 lines

MOD_gpenciltime.c

3 lines

MOD_gpenciltint.c

29 lines

MOD_gpencilweight_angle.c

4 lines

MOD_gpencilweight_proximity.c

29 lines

lineart/

2 lines

io/

gpencil/

intern/

gpencil_io_import_svg.cc

2 lines

makesdna/

DNA_brush_enums.h

4 lines

DNA_gpencil_types.h

42 lines

DNA_scene_defaults.h

3 lines

DNA_scene_types.h

21 lines

intern/

1 line

makesrna/

intern/

12 lines

99 lines

21 lines

Diff 45377

release/scripts/presets/keyconfig/keymap_data/blender_default.py

Loading...

release/scripts/startup/bl_app_templates_system/2D_Animation/init.py

Loading...

release/scripts/startup/bl_ui/properties_data_gpencil.py

Loading...

release/scripts/startup/bl_ui/properties_grease_pencil_common.py

Loading...

release/scripts/startup/bl_ui/space_toolsystem_toolbar.py

Loading...

release/scripts/startup/bl_ui/space_view3d.py

Loading...

release/scripts/startup/bl_ui/space_view3d_toolbar.py

Loading...

source/blender/blenkernel/BKE_gpencil.h

Loading...

source/blender/blenkernel/BKE_gpencil_curve.h

Loading...

source/blender/blenkernel/BKE_gpencil_geom.h

Loading...

source/blender/blenkernel/BKE_gpencil_modifier.h

Loading...

source/blender/blenkernel/intern/armature_deform.c

Loading...

source/blender/blenkernel/intern/brush.c

Loading...

source/blender/blenkernel/intern/gpencil.c

Loading...

source/blender/blenkernel/intern/gpencil_curve.c

Loading...

source/blender/blenkernel/intern/gpencil_geom.cc

Loading...

source/blender/blenkernel/intern/gpencil_modifier.c

Loading...

source/blender/blenloader/intern/versioning_280.c

Loading...

source/blender/blenloader/intern/versioning_290.c

Loading...

source/blender/blenloader/intern/versioning_300.c

Loading...

source/blender/draw/engines/overlay/overlay_gpencil.c

Loading...

source/blender/draw/engines/overlay/shaders/edit_gpencil_vert.glsl

Loading...

source/blender/draw/intern/draw_cache_impl_gpencil.c

Loading...

source/blender/editors/gpencil/CMakeLists.txt

Loading...

source/blender/editors/gpencil/gpencil_add_monkey.c

Loading...

source/blender/editors/gpencil/gpencil_add_stroke.c

Loading...

source/blender/editors/gpencil/gpencil_bake_animation.c

Loading...

source/blender/editors/gpencil/gpencil_convert.c

Loading...

source/blender/editors/gpencil/gpencil_curve_draw.c

Loading...

source/blender/editors/gpencil/gpencil_data.c

Loading...

source/blender/editors/gpencil/gpencil_edit.c

Loading...

source/blender/editors/gpencil/gpencil_edit_curve.c

Loading...

source/blender/editors/gpencil/gpencil_fill.c

Loading...

source/blender/editors/gpencil/gpencil_intern.h

Loading...

source/blender/editors/gpencil/gpencil_interpolate.c

Loading...

source/blender/editors/gpencil/gpencil_merge.c

Loading...

source/blender/editors/gpencil/gpencil_ops.c

Loading...

source/blender/editors/gpencil/gpencil_paint.c

Loading...

source/blender/editors/gpencil/gpencil_primitive.c

Loading...

source/blender/editors/gpencil/gpencil_sculpt_paint.c

Loading...

source/blender/editors/gpencil/gpencil_select.c

Loading...

source/blender/editors/gpencil/gpencil_trace_utils.c

Loading...

source/blender/editors/gpencil/gpencil_utils.c

Loading...

source/blender/editors/gpencil/gpencil_uv.c

Loading...

source/blender/editors/gpencil/gpencil_vertex_ops.c

Loading...

source/blender/editors/gpencil/gpencil_vertex_paint.c

Loading...

source/blender/editors/gpencil/gpencil_weight_paint.c

Loading...

source/blender/editors/include/ED_gpencil.h

Loading...

source/blender/editors/screen/area.c

Loading...

source/blender/editors/transform/transform_convert_gpencil.c

Loading...

source/blender/editors/transform/transform_gizmo_3d.c

Loading...

source/blender/editors/transform/transform_mode_gpopacity.c

Loading...

source/blender/editors/transform/transform_mode_gpshrinkfatten.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilbuild.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencildash.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencillength.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilmultiply.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpenciltexture.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpenciltime.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilweight_angle.c

Loading...

source/blender/gpencil_modifiers/intern/MOD_gpencilweight_proximity.c

Loading...

source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c

Loading...

source/blender/io/gpencil/intern/gpencil_io_import_svg.cc

Loading...

source/blender/makesdna/DNA_brush_enums.h

Loading...

source/blender/makesdna/DNA_gpencil_types.h

Loading...

source/blender/makesdna/DNA_scene_defaults.h

Loading...

source/blender/makesdna/DNA_scene_types.h

Loading...

source/blender/makesdna/intern/dna_defaults.c

Loading...

source/blender/makesrna/intern/rna_brush.c

Loading...

source/blender/makesrna/intern/rna_gpencil.c

Loading...

source/blender/makesrna/intern/rna_scene.c

Loading...