Paths

Table of Contentst

Refactor our ID copying and freeing code
AbandonedPublic
Actions

Authored by Bastien Montagne (mont29) on Jun 16 2017, 12:04 PM.

Details

Reviewers

Sergey Sharybin (sergey)
Campbell Barton (campbellbarton)
Dalai Felinto (dfelinto)

Summary

This is initial (and partial/incomplete) implementation of T51804.

Some notes about current patch:

I) Compared to T51804, also added new handling of freeing (since things like 'not in Main', 'not user-refcounting' etc. also are crucial to be correctly handled by freeing code.

II) It is not finished! This is first step, laying out new API and general behavior. Lots of work remains to get master-ready patch, mostly monkey-coding in copy area.

III) It aims at not breaking anything (obviously), also for current branches. To do so, it mostly defines *new* functions, and avoids changing signature/behavior of existing ones in most cases. That's why we have some duplicated code/functionnality, goal is to get rid of deprecated functions later, as smoothly as possible for everybody.

IV) Biggest changes (and most noisy ones) will be in copy code, since right now most of it always assumes to always increment usercount of used IDs. Not sure if we want to double all those functions with _ex versions taking flag optionsparameter, or to directly modify existing ones? The former would ensure we do not break any existing branch, the later would avoid adding too much new functions...

Diff Detail

Repository

rB Blender

Branch

id_copy_refactor

Build Status

Buildable 716
Build 716: arc lint + arc unit

Event Timeline

Bastien Montagne (mont29) created this revision.Jun 16 2017, 12:04 PM

So, biggest initial work is done, new copy system shall be usable now.

Some notes:

Sound and VFont are now also copyable - code is a bit theoric here though...
Scene copying was quite heavily refactored to behave same as other datablocks in default copying.
Nuked some ID's custom copying code (like ugly creation of empty datablock + manual copying of data from source, yuck!), now all use same standard operations.
Datablock copy callbacks are now named '..._copy_data()', because they only copy internal data, not ID itself at all.
Those changes also implied some update of some neighbor code (like some sub-data copying functions).
Am not happy with dirty hack in VFont copying, thing is, BLI' freefont uses BKE's Nurbs... design sounds nasty to me here :/
I refrained from trying to move everyting to new code for now - better first get it tested a bit seriously and put into master, before trying to handle things like 'localize' functions used by rendering process...
Code is designed to allow evolution in copy behaviors (the flag system), we probably will need to refine a bit options there as we use it more and more.

Make object copying fully compatible/aware of new copy flag system.
Add Mesh and Key support to new copying code.
Fix wrong assert, and issue with Key ID freeing tag after copying from mesh...
Add new Curve copying code.
Add mball and lattice new copying, tweak a bit more skey handling.
Add remaining 'new copying' for obdata ID types.
Initial work on new copying for nodetrees.
Change a bit ideas behind new copying code, now ID-specific copying never handles usercount.
Move Material, Texture and Image datablocks to new copying code.
Rename new BKE_<foo>_copy_ex to BKE_<foo>_copy_data.
Move World and MovieClip to new copying system.
Move Group and ParticleSettings to new copying system.
Merge branch 'master' into id_copy_refactor
Move Action to new copying code.
Move Text, Brush and GPencil datablocks to new copying code.
Move Mask and FreestyleLineStyle to new ID copying code.
Move Palette, PaintCurve and CacheFIle to new ID copying system.
Add Sound copying callback.
Add VFont copying.
Huuuuge refactor of Scene copying, added to generic library ID copying.
Fix several crashes and other issues in new ID copying code.
Fix stupid mistake in new LineStyle copying code.

@ potential reviewers: This is a huge patch, but main entry point to review are changes in library.c (and BKE_library.h), those define and control the new behavior.

All changes done in other BKE files for every datatypes are more like boring reorganization, except for the Scene one (and maybe a few others), nice to check, but can be also mostly ignored.

Bastien Montagne (mont29) mentioned this in rB9da7dfa1586d: Refactor ID copying (and to some extent, ID freeing)..Aug 7 2017, 4:54 PM

Bastien Montagne (mont29) mentioned this in rB41830cc432b9: Refactor ID copying (and to some extent, ID freeing)..Aug 7 2017, 8:49 PM

Committed in rB9da7dfa1586dd8

Revision Contents
Changeset List

Path

Size

source/

blender/

blenkernel/

6 lines

6 lines

1 line

1 line

2 lines

1 line

1 line

1 line

1 line

2 lines

1 line

1 line

3 lines

1 line

1 line

1 line

1 line

64 lines

15 lines

1 line

1 line

1 line

1 line

1 line

1 line

2 lines

10 lines

6 lines

3 lines

2 lines

6 lines

14 lines

1 line

4 lines

2 lines

1 line

1 line

7 lines

2 lines

1 line

intern/

86 lines

13 lines

76 lines

48 lines

26 lines

23 lines

24 lines

55 lines

17 lines

18 lines

79 lines

31 lines

51 lines

64 lines

49 lines

54 lines

43 lines

316 lines

90 lines

125 lines

30 lines

66 lines

35 lines

63 lines

29 lines

36 lines

289 lines

161 lines

61 lines

55 lines

9 lines

32 lines

32 lines

399 lines

22 lines

28 lines

26 lines

68 lines

100 lines

44 lines

52 lines

blenlib/

BLI_vfontdata.h

2 lines

intern/

freetypefont.c

29 lines

blenloader/

intern/

writefile.c

3 lines

editors/

armature/

armature_relations.c

4 lines

object/

object_edit.c

18 lines

object_relations.c

4 lines

physics/

particle_object.c

2 lines

render/

render_shading.c

8 lines

space_sequencer/

sequencer_edit.c

6 lines

makesdna/

DNA_ID.h

10 lines

modifiers/

intern/

8 lines

14 lines

6 lines

6 lines

4 lines

6 lines

MOD_weightvgproximity.c

6 lines

Commit	Tree	Parents	Author	Summary	Date
5019fc1c8d81	c373a10edd89	2f812e1d7bd3 cd3b3e4a57c1	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jul 11 2017, 3:57 PM
2f812e1d7bd3	7d28df151f20	e75db0e61bd0	Bastien Montagne	Fix stupid mistake in new LineStyle copying code.	Jul 11 2017, 3:56 PM
e75db0e61bd0	d3c7306fd54b	524e03cae1c3	Bastien Montagne	Fix several crashes and other issues in new ID copying code. (Show More…)	Jul 11 2017, 2:16 PM
524e03cae1c3	d5af7693dc22	d3abcf3318a9	Bastien Montagne	Huuuuge refactor of Scene copying, added to generic library ID copying. (Show More…)	Jul 11 2017, 10:31 AM
d3abcf3318a9	587004903102	0dc428410a13 8677c76f138e	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jul 10 2017, 9:30 PM
0dc428410a13	699cb17445a2	0698e892c751 806bc4b43396	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jul 10 2017, 3:23 PM
0698e892c751	b98083f5803e	a7bf34cc0bd4	Bastien Montagne	Add VFont copying. (Show More…)	Jul 10 2017, 1:57 PM
a7bf34cc0bd4	133f01434da3	0b009edbdea3	Bastien Montagne	Add Sound copying callback.	Jul 10 2017, 12:20 PM
0b009edbdea3	ed3481682951	8bcf950c28c7	Bastien Montagne	Move Palette, PaintCurve and CacheFIle to new ID copying system.	Jul 10 2017, 9:56 AM
8bcf950c28c7	a3bebf5f1940	6637530b811f	Bastien Montagne	Move Mask and FreestyleLineStyle to new ID copying code.	Jul 9 2017, 10:44 PM
6637530b811f	3c80a985c8cc	dcfbe9a6f01e	Bastien Montagne	Move Text, Brush and GPencil datablocks to new copying code.	Jul 9 2017, 10:14 PM
dcfbe9a6f01e	d80ff9c57404	f5f013d23151	Bastien Montagne	Move Action to new copying code.	Jul 9 2017, 9:41 PM
f5f013d23151	86fb1aa7a127	caae973b8ab0 ba256b32ee5d	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jul 9 2017, 9:21 PM
caae973b8ab0	68c755947333	5a1cae541a1c	Bastien Montagne	Move Group and ParticleSettings to new copying system. (Show More…)	Jul 8 2017, 5:09 PM
5a1cae541a1c	63854ea3b6c5	fe46bb8b0e01	Bastien Montagne	Move World and MovieClip to new copying system.	Jul 8 2017, 12:46 PM
fe46bb8b0e01	50c9be6c62b7	17ceb807dd48	Bastien Montagne	Rename new `BKE_<foo>_copy_ex` to `BKE_<foo>_copy_data`. (Show More…)	Jul 8 2017, 12:20 PM
17ceb807dd48	e2d5a5afe189	fc6619a9ff14	Bastien Montagne	Move Material, Texture and Image datablocks to new copying code. (Show More…)	Jul 8 2017, 12:14 PM
fc6619a9ff14	5fcffdf103f8	022ad8f76991 00d476976e88	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jul 7 2017, 12:35 PM
022ad8f76991	f9efede94e46	8af813fee937	Bastien Montagne	Change a bit ideas behind new copying code, now ID-specific copying never… (Show More…)	Jul 6 2017, 3:46 PM
8af813fee937	e3cd55ce8ed1	af46458c62b4 bdd814d87da3	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jul 6 2017, 12:26 PM
af46458c62b4	7e559dfe7977	b7145a2662dd 0172ed8fe55b	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jun 26 2017, 11:01 AM
b7145a2662dd	19cef7b1f6fb	48a85f99eb39	Bastien Montagne	Initial work on new copying for nodetrees. (Show More…)	Jun 26 2017, 10:53 AM
48a85f99eb39	1a8556566a4f	663528491702	Bastien Montagne	Add remaining 'new copying' for obdata ID types.	Jun 22 2017, 10:46 PM
663528491702	e7142aa43fc0	c907b160658b 7abed4e4332e	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jun 22 2017, 10:44 AM
c907b160658b	b24589e5bcfb	797a696734b5	Bastien Montagne	Add mball and lattice new copying, tweak a bit more skey handling.	Jun 21 2017, 11:08 AM
797a696734b5	f566b32ea344	90a463dcfc65 af3545591228	Bastien Montagne	Merge branch 'master' into id_copy_refactor	Jun 21 2017, 10:49 AM
90a463dcfc65	120177ba7925	1f7c6fda5d16	Bastien Montagne	Add new Curve copying code.	Jun 20 2017, 9:34 PM
1f7c6fda5d16	6e4f592cac9d	39b0c6f0605e	Bastien Montagne	Fix wrong assert, and issue with Key ID freeing tag after copying from mesh...	Jun 20 2017, 9:20 PM
39b0c6f0605e	ec46ba8508f7	3a86873b68b8	Bastien Montagne	Add Mesh and Key support to new copying code.	Jun 20 2017, 5:53 PM
3a86873b68b8	65e23a22d93c	596c20c677a7	Bastien Montagne	Make object copying fully compatible/aware of new copy flag system. (Show More…)	Jun 20 2017, 1:39 PM
596c20c677a7	95d53d1f72a6	d0af31b317c6	Sybren A. Stüvel	Alembic tests: make failures a bit easier to diagnose.	Jun 19 2017, 5:55 PM
d0af31b317c6	a688b28bb76b	12a5a628f355	Sybren A. Stüvel	Fix T51762: Unit test script_alembic_import is failing. (Show More…)	Jun 19 2017, 5:50 PM
12a5a628f355	041c19e9bbe0	b72ba5c78d12	Sybren A. Stüvel	Fixed bl_load_py_modules / script_load_modules unit test (Show More…)	Jun 19 2017, 3:28 PM
b72ba5c78d12	bca926393fdd	0687d8bdce4b	Sybren A. Stüvel	Use for/else instead of setting 'ok' variable. (Show More…)	Jun 19 2017, 3:25 PM
0687d8bdce4b	6c2f6e40fe2c	258634b43c6d	Sybren A. Stüvel	Removed trailing spaces	Jun 19 2017, 10:46 AM
258634b43c6d	dae669ea3c22	babc0c9bd71d	Bastien Montagne	Fix (unreported) missing Image usercount increase when copying UVProject… (Show More…)	Jun 19 2017, 3:05 PM
babc0c9bd71d	bc811badffdf	749a8daf26f2	Bastien Montagne	Fix (unreported) bad copying code of Surface Deform modifier.	Jun 19 2017, 2:57 PM
749a8daf26f2	36d73e0fb03f	2d3b6b5ad7cd	Bastien Montagne	Fix compiler warnings from own recent rB0d5c7e5e36b9.	Jun 19 2017, 2:43 PM
2d3b6b5ad7cd	8f8c6e2ab9e9	20e3434c5f14	Bastien Montagne	Fix (unreported) bad copying of Ocean modifier. (Show More…)	Jun 19 2017, 2:40 PM
20e3434c5f14	0b4dde7dd5f2	77046ba9d85a	Bastien Montagne	Fix (unreported) bad copying code in Mesh Deform modifier.	Jun 19 2017, 12:55 PM
77046ba9d85a	106908341255	147735587c27	Bastien Montagne	Fix (unreported) Dynamic Paint modifier not increasing ID usercount in copy… (Show More…)	Jun 19 2017, 12:25 PM
147735587c27	7323b0365212	44b1680fbf2f	Bastien Montagne	Fix (unreported) memory leak in Fluid modifier copying. (Show More…)	Jun 19 2017, 12:21 PM
44b1680fbf2f	8abf7bd3e378	46af186d21d7	Bastien Montagne	WIP	Jun 19 2017, 12:16 PM
46af186d21d7	912bd7c18ea2	e61dbcd28492	Campbell Barton	Cleanup: doxygen comments (Show More…)	Jun 19 2017, 1:33 AM
e61dbcd28492	6142306b91c8	5f6725337aa1	Bastien Montagne	Fix T51774: Children particles hair interpolation not correct with textures or… (Show More…)	Jun 18 2017, 11:54 PM
5f6725337aa1	9f40f774618b	780310578a0c	Thomas Beck	Fix T51840: UI redraw in node editor header missing on pointcache bake (Show More…)	Jun 18 2017, 4:26 PM
780310578a0c	7f6a8dbdc0e7	d8de77241098	Lukas Stockner	Fix unreported: Copy-pasting nodes crashes when they have an undefined type	Jun 18 2017, 5:13 AM
d8de77241098	4f85040bacb7	f45300856cfb	Campbell Barton	Docs: Fix file:line links in generated API docs	Jun 17 2017, 6:33 PM
f45300856cfb	69a2800d9a2b	6493328e3722	Campbell Barton	Add Cone: tip soft-min should be zero (Show More…)	Jun 17 2017, 6:07 PM
6493328e3722	254ca29cf138	2e9580e4175c	Sergey Sharybin	Guarded allocator: Fix type in macro definition (Show More…)	Jun 17 2017, 4:13 PM
2e9580e4175c	f3b278687f76	0e78b3b794cc	Aaron Carlisle	PyAPI: Fix warning about indent	Jun 16 2017, 6:30 PM
0e78b3b794cc	57c77156699e	09e5d1bc8498	Bastien Montagne	Fix T51810: Add minimal example of usage of translation API for non-official… (Show More…)	Jun 16 2017, 4:43 PM
09e5d1bc8498	6fb09cfd745b	23941b425ed9	Bastien Montagne	Usual i18n/UI messages fixes. (Show More…)	Jun 16 2017, 12:50 PM
23941b425ed9	703f3110aefd	fa64dfa449d4	Bastien Montagne	Add same new ID freeing API as copying one. (Show More…)	Jun 15 2017, 4:18 PM
fa64dfa449d4	1acaba53f03d	7edeccf81d5a	Bastien Montagne	On second thought, avoid adding new stuff to ID. (Show More…)	Jun 15 2017, 11:05 AM
7edeccf81d5a	99844e422b58	8d22d5a2a9b4	Bastien Montagne	Fleshing a bit new copy logic (using Object datablock as Guinea pig).	Jun 14 2017, 9:05 PM
8d22d5a2a9b4	5beaa1a54ab5	794311c92bb2	Bastien Montagne	Layout initial ideas/code structure of new ID copying.	Jun 14 2017, 5:08 PM

Refactor our ID copying and freeing codeAbandonedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 9003

source/blender/blenkernel/BKE_action.h

source/blender/blenkernel/BKE_animsys.h

source/blender/blenkernel/BKE_armature.h

source/blender/blenkernel/BKE_brush.h

source/blender/blenkernel/BKE_cachefile.h

source/blender/blenkernel/BKE_camera.h

source/blender/blenkernel/BKE_constraint.h

source/blender/blenkernel/BKE_curve.h

source/blender/blenkernel/BKE_font.h

source/blender/blenkernel/BKE_freestyle.h

source/blender/blenkernel/BKE_gpencil.h

source/blender/blenkernel/BKE_group.h

source/blender/blenkernel/BKE_idprop.h

source/blender/blenkernel/BKE_image.h

source/blender/blenkernel/BKE_key.h

source/blender/blenkernel/BKE_lamp.h

source/blender/blenkernel/BKE_lattice.h

source/blender/blenkernel/BKE_library.h

source/blender/blenkernel/BKE_linestyle.h

source/blender/blenkernel/BKE_mask.h

source/blender/blenkernel/BKE_material.h

source/blender/blenkernel/BKE_mball.h

source/blender/blenkernel/BKE_mesh.h

source/blender/blenkernel/BKE_modifier.h

source/blender/blenkernel/BKE_movieclip.h

source/blender/blenkernel/BKE_node.h

source/blender/blenkernel/BKE_object.h

source/blender/blenkernel/BKE_paint.h

source/blender/blenkernel/BKE_particle.h

source/blender/blenkernel/BKE_pointcache.h

source/blender/blenkernel/BKE_rigidbody.h

source/blender/blenkernel/BKE_sca.h

source/blender/blenkernel/BKE_scene.h

source/blender/blenkernel/BKE_sequencer.h

source/blender/blenkernel/BKE_sound.h

source/blender/blenkernel/BKE_speaker.h

source/blender/blenkernel/BKE_text.h

source/blender/blenkernel/BKE_texture.h

source/blender/blenkernel/BKE_tracking.h

source/blender/blenkernel/BKE_world.h

source/blender/blenkernel/intern/action.c

source/blender/blenkernel/intern/anim_sys.c

source/blender/blenkernel/intern/armature.c

source/blender/blenkernel/intern/brush.c

source/blender/blenkernel/intern/cachefile.c

source/blender/blenkernel/intern/camera.c

source/blender/blenkernel/intern/constraint.c

source/blender/blenkernel/intern/curve.c

source/blender/blenkernel/intern/font.c

source/blender/blenkernel/intern/freestyle.c

source/blender/blenkernel/intern/gpencil.c

source/blender/blenkernel/intern/group.c

source/blender/blenkernel/intern/idprop.c

source/blender/blenkernel/intern/image.c

source/blender/blenkernel/intern/key.c

source/blender/blenkernel/intern/lamp.c

source/blender/blenkernel/intern/lattice.c

source/blender/blenkernel/intern/library.c

source/blender/blenkernel/intern/library_remap.c

source/blender/blenkernel/intern/linestyle.c

source/blender/blenkernel/intern/mask.c

source/blender/blenkernel/intern/material.c

source/blender/blenkernel/intern/mball.c

source/blender/blenkernel/intern/mesh.c

source/blender/blenkernel/intern/modifier.c

source/blender/blenkernel/intern/movieclip.c

source/blender/blenkernel/intern/node.c

source/blender/blenkernel/intern/object.c

source/blender/blenkernel/intern/paint.c

source/blender/blenkernel/intern/particle.c

source/blender/blenkernel/intern/pointcache.c

source/blender/blenkernel/intern/rigidbody.c

source/blender/blenkernel/intern/sca.c

source/blender/blenkernel/intern/scene.c

Refactor our ID copying and freeing code
AbandonedPublic
Actions

Revision Contents
Changeset List