Paths

Table of Contentst

Datablock ID Properties
ClosedPublic
Actions

Authored by Alexander Romanov (a.romanov) on Dec 16 2013, 7:36 PM.

Details

Reviewers

Bastien Montagne (mont29)
Campbell Barton (campbellbarton)
Brecht Van Lommel (brecht)
Tom Edwards (artfunkel)

Maniphest Tasks

T37754: Patch: DatablockProperty and DatablockVectorProperty

Commits

rBSa7b3047cefcb: Datablock ID Properties
rBa7b3047cefcb: Datablock ID Properties
rBa3f48d65df19: Datablock ID Properties

Summary

The absence of datablock properties "will certainly be resolved soon as the need for them is becoming obvious" said the Python Nodes release notes. So this patch allows Python scripts to create ID Properties which reference datablocks.
This functionality is implemented for PointerProperty and now such properties can be created with Python.

In addition to the standard update callback, PointerProperty can have a poll callback (standard RNA) which is useful for search menus. For details see the test included in this patch.

Original author: @Tom Edwards (artfunkel)

Alexander (Blend4Web Team)

Diff Detail

Repository

rB Blender

Branch

arcpatch-D113

Build Status

Buildable 535
Build 535: arc lint + arc unit

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes

Bastien Montagne (mont29) added inline comments.Mar 18 2017, 4:57 PM

source/blender/blenkernel/BKE_idprop.h
95–96	To be removed
source/blender/blenkernel/BKE_scene.h
101 ↗	(On Diff #8353)	This should be nuked away, and what it’s doing should be done directly in ED_object_single_users. (ultimately/ideally all this should be replaced by some calls to library_remap.c function, but this is TODO out-of-scope of this patch).
source/blender/blenkernel/intern/idprop.c
39	To be removed
48	To be removed
source/blender/blenkernel/intern/library_query.c
238–239	Eeeek! no, absolutely not, `dtar->id` is a target, not an owner, here, it shall absolutely not be processed here. To be removed.
source/blender/blenkernel/intern/library_remap.c
750–751	What is this doing here? this should absolutely not be needed. Call to `BKE_libblock_relink_ex()` below is supposed to do the work - if requested by caller only.
877	Tsst, please avoid those useless changes in patch ;)
source/blender/blenloader/intern/readfile.c
1959–2004	This whole section looks like missed merge or something? see no reason for this to be different from master?
2014–2051	Again, why those changes?
source/blender/editors/interface/interface_regions.c
815	should rather be `size_t offset`, since it’s operating on pointer
source/blender/editors/object/object_relations.c
2095–2106	AFAIK `old_scene` is not used at all now? can be nuked then.
source/blender/makesrna/RNA_define.h
169	That kind of change sounds suspicious, what’s the point here? we nearly never use `type * const ptr` (i.e. const pointer to variable data, `const type *ptr` being variable pointer to const data) in Blender…
source/blender/makesrna/intern/rna_access.c
644	Still not clear why those tests have been removed?
2989	Why not use `IDP_ID()` macro here, instead of 'low-level' access to `idprop->data.pointer`?
4298–4355	Again, don’t seem right, that kind of changes should not be needed, why are they here?
source/blender/makesrna/intern/rna_define.c
1266	This is wrong, we are talking about 'real' RNA properties here, not IDProps. We do not support arrays of pointers in RNA properties afaik.

This revision now requires changes to proceed.Mar 18 2017, 4:57 PM

I will update the patch and then will create a branch.

I could not answer some points because of fabricator bugs (callstack: http://pasteall.org/310079)

source/blender/blenkernel/intern/library_remap.c
750–751	Currently we should remap id to NULL regardless do_id_user, when we will try to remove some other block, which point to this one with idprop, the attempt to free will cause crash because of bad pointer on freed id. Else we should pass do_id_user to IDP_FreeProperty
source/blender/makesrna/RNA_define.h
169	Actually don't remember how it's happened. You're right.

Atavistic changes in test_pointer_array have been reverted.
Handling idprops for sockets and bones in BKE_library_foreach_ID_link has been added.
Cleanup has been made.

Isaac Weaver (wisaac) added a subscriber: Isaac Weaver (wisaac).Mar 21 2017, 11:55 PM

Did a bunch of cleanup & co in branch, can you please update the diff? @Campbell Barton (campbellbarton) maybe you'd like to have a look at the bpy part of this too? can do it, but not that familiar with it…

@Alexander Romanov (a.romanov) I mainly have two pending questions currently:

Still not clear why you always remap in BKE_libblock_free_ex, https://developer.blender.org/D113#inline-25153 does not help me much here… I consider this a show stopper, we cannot accept this in master.
Why do we have an IDP_IDPARRAY type??? I’d expect IDP_ARRAY do be able to handle arrays of IDP_ID properties just as well?

I think #1 is actually related to the fact we have 'unlink' for IDP_ID, when we have freeing for all other types… imho there is no need for special naming here, even if we do not actually free anything in IDP_ID case, whould still be handled exactly as any other IDP freeing function.

Was on the verge of making changes in the branch to address #1 when I realized #2, so… Thought I’d ask why before going into too much refactoring. ;)

This revision now requires changes to proceed.Mar 28 2017, 4:05 PM

Still not clear why you always remap in BKE_libblock_free_ex, https://developer.blender.org/D113#inline-25153 does not help me much here… I consider this a show stopper, we cannot accept this in master.

You can reproduce the issue if you will run the test in Blender, compilled with asan, without libblock_remap_data call. It will crash during Main release. Passing do_id_user to IDP_FreeProperty is verbose. Using of some global flag is dirty hack...

Why do we have an IDP_IDPARRAY type??? I’d expect IDP_ARRAY do be able to handle arrays of IDP_ID properties just as well?

Don't actually know about the reason of differentiation of this two types. Probably, with checking prop->subtype they can be merged.

Updated with changes from datablock_idprops branch

In D113#60552, @Alexander Romanov (a.romanov) wrote:

Still not clear why you always remap in BKE_libblock_free_ex, https://developer.blender.org/D113#inline-25153 does not help me much here… I consider this a show stopper, we cannot accept this in master.

You can reproduce the issue if you will run the test in Blender, compilled with asan, without libblock_remap_data call. It will crash during Main release. Passing do_id_user to IDP_FreeProperty is verbose. Using of some global flag is dirty hack...

Can’t confirm that here, with current branch both 'idprop' tests pass OK with this line disabled for me.

Why do we have an IDP_IDPARRAY type??? I’d expect IDP_ARRAY do be able to handle arrays of IDP_ID properties just as well?

Don't actually know about the reason of differentiation of this two types. Probably, with checking prop->subtype they can be merged.

OK, will merge this back into IDP_ARRAY then.

In D113#60585, @Bastien Montagne (mont29) wrote:

In D113#60552, @Alexander Romanov (a.romanov) wrote:

Still not clear why you always remap in BKE_libblock_free_ex, https://developer.blender.org/D113#inline-25153 does not help me much here… I consider this a show stopper, we cannot accept this in master.

You can reproduce the issue if you will run the test in Blender, compilled with asan, without libblock_remap_data call. It will crash during Main release. Passing do_id_user to IDP_FreeProperty is verbose. Using of some global flag is dirty hack...

Can’t confirm that here, with current branch both 'idprop' tests pass OK with this line disabled for me.

Are you sure you have asan build? I have no crash without asan.
Here is asan report:

logfile10 KBDownload

I still cannot reproduce… you’r using CTest right? ctest --output-on-failure -R "idprop" … works fine for me :/

In D113#60612, @Bastien Montagne (mont29) wrote:

I still cannot reproduce… you’r using CTest right? ctest --output-on-failure -R "idprop" … works fine for me :/

No, you use different test which was added recently.
I use the test from the patch:
bin/blender -P ../blender/tests/python/bl_pyapi_datablock_idprop.py

yeah, my commandline includes bl_pyapi_datablock_idprop test…

I've patched id_us_min to print the name of objects

void id_us_min(ID *id)
{
	if (id) {
		fprintf(stderr, "%s\n", id->name);
		const int limit = ID_FAKE_USERS(id);
....

Here are results:

logfile_asan18 KBDownload

logfile845 KBDownload

Thinking you are not using up-to-date branch? IDP_id_unregister() has been removed (see rBaae70f182b1477dc9f ).

In D113#60619, @Bastien Montagne (mont29) wrote:

Thinking you are not using up-to-date branch? IDP_id_unregister() has been removed (see rBaae70f182b1477dc9f ).

last commit:

commit 171c39cc196d088153fcd20561fa85dfe04813b1
Merge: aae70f1 48fa2c8
Author: Bastien Montagne <montagne29@wanadoo.fr>
Date:   Wed Mar 29 16:25:09 2017 +0200

    Merge branch 'master' into datablock_idprops

Still have the same crash

arrrrg! Ahd forgotten to comment again that stupid line in library_remap before testing your command… now can reproduce the crash, sorry for that :(

OK, so finally understood that stupid freeing issue, indeed, correct solution is to pass do_id_user to IDP freeing functions, which makes sense, since they handle ID usages too now…

Pushed the fix, re idparray in fact will let that aside for now, this is unrelated with the patch anyway (my mistake).

So will give it another round of global checkup this afternoon, but think it’s nearly mergeable now :)

Bastien Montagne (mont29) mentioned this in rBe5fa738ce972: UI cleanup: simplify Icon handling of uiDefAutoButR for PROP_POINTER..Mar 31 2017, 12:16 PM

OK, pushed final changes from my side, considering the branch ready for merge (can you please update again the diff?).

Unless others want to check (again, only quickly skimmed over bpy changes…), only remaining question is: is it safe to merge this in master (for upcoming 2.79), or should we rather keep this for 2.8, @Sergey Sharybin (sergey)? @Campbell Barton (campbellbarton)?
Wondering, since I had to make changes to (and fix) a lot of things in branch during review, and this affects rather core parts of the code (and easy crashers too, ID pointers...). So am worry about relative short time before 2.79 (we already postponed bcon3 two weeks).

Checked the patch and generally seems OK.

Some questions:

Did anyone test this patch on a complex file? Are there slowdowns, if so how much?:
- Deleting an object in a file with ~1k objects.
- Deleting all objects.
- Undo.
Are there any issues with an ID referencing it's self in collection?
Does this work with library data?
- Does making an indirectly linked data-block directly linked work correctly on reload for eg?
- Will linking in a data-block follow its id-properties too?

source/blender/python/intern/bpy_props.c
402	redundant cast.
source/blender/python/intern/bpy_rna.c
3274	style issues
tests/python/bl_pyapi_datablock_idprop.py
1 ↗	(On Diff #8507)	We have `bl_pyapi_idprop.py` currently, could be called `bl_pyapi_idprop_datablock.py` ?
27–52 ↗	(On Diff #8507)	Looks like this could use Python's unittest module, see `bl_pyapi_idprop.py`. Not pushing to rewrite for release, just think it could be done a bit more cleanly.

Updated from the datablock_idprops branch
Taken into account the comments of @Campbell Barton (campbellbarton)

I will make some speed tests to measure slowdowns.

Salvador Ureña (Asticles) removed a subscriber: Salvador Ureña (Asticles).Apr 5 2017, 2:20 PM

In D113#60861, @Campbell Barton (campbellbarton) wrote:

Checked the patch and generally seems OK.

Some questions:

Did anyone test this patch on a complex file? Are there slowdowns, if so how much?:

Deleting an object in a file with ~1k objects.

Deleting all objects.

Undo.

Here are my results: https://docs.google.com/spreadsheets/d/1S_vwTViBw0IPcyeN6Og7htXr38qLn722q38Gxk1n6Mk/edit?usp=sharing
Source: P460

Are there any issues with an ID referencing it's self in collection?

Did not notice. Could you point to some test-case?

Does this work with library data?

Does making an indirectly linked data-block directly linked work correctly on reload for eg?

Did not notice incorrect behavior.

Will linking in a data-block follow its id-properties too?

Yes, it follows.

I can add additional tests.

JT Nelson (jta) added a subscriber: JT Nelson (jta).Apr 9 2017, 4:52 PM

Cleanup: quiet unused warning

Campbell Barton (campbellbarton) requested changes to this revision.Apr 10 2017, 10:15 AM

Campbell Barton (campbellbarton) added inline comments.

tests/python/CMakeLists.txt

This file doesn't exist, even when corrected tests are raising an error for me:

Traceback (most recent call last):
  File "/src/blender/tests/python/bl_datablock_idprop.py", line 328, in <module>
    main()
  File "/src/blender/tests/python/bl_datablock_idprop.py", line 319, in main
    test0()
  File "/src/blender/tests/python/bl_datablock_idprop.py", line 186, in test0
    lamp_us = bpy.data.objects["Lamp"].data.users
KeyError: 'bpy_prop_collection[key]: key "Lamp" not found'

This revision now requires changes to proceed.Apr 10 2017, 10:15 AM

Correct mistake, last patch made against soc-2016-pbvh-painting

point to correct test file in cmake config
fix test portability by replacing read_home_file with read_factory_settings

Updated for the current state of master branch

Use pyrna_id_CheckPyObject instead of attempting to convert

pep8 cleanup

Made some fix for Py API checking ID-properties, otherwise LGTM.

(Some comments on tests but not blocking issues)

tests/python/bl_pyapi_idprop_datablock.py
2	Note this test doesn't really check for correct behavior - just that it doesn't give some exception, dont think its a blocker for the patch but would prefer something closer to how `bl_pyapi_idprop.py` works.
319–324	these names are fairly meaningless, please use: `test_what_the_test_does`

fix tests' names + comments corrections

fix incorrect indentation in abort_if_false + lowercase start symbol of comments

Harbormaster completed remote builds in B554: Diff 8619.Apr 12 2017, 7:29 PM

Remove red alert (will be added in separate commit)

fix harmless mistake in copy paste

Closed by commit rBa7b3047cefcb: Datablock ID Properties (authored by Alexander Romanov (a.romanov)). · Explain WhyApr 13 2017, 11:36 AM

This revision was automatically updated to reflect the committed changes.

Alexander Romanov (a.romanov) mentioned this in T51198: Crash with new Datablock ID Properties.Apr 14 2017, 3:10 PM

mic lack30 (miclack) awarded a token.Apr 14 2017, 8:39 PM

Alexander Romanov (a.romanov) mentioned this in T51260: Forward compatibility after D113.Apr 20 2017, 10:49 AM

Alexander Romanov (a.romanov) mentioned this in rBf5bc8ad4ce87: Add red alert in UI controls for datablock pointer properties.Apr 27 2017, 5:34 PM

Kerim Borchaev (warkid) added a subscriber: Kerim Borchaev (warkid).Apr 30 2017, 11:50 PM

Campbell Barton (campbellbarton) mentioned this in rB5cdd94a58e6b: Fix PyAPI crash assigning/deleting id-properties.May 6 2017, 3:53 PM

Brecht Van Lommel (brecht) mentioned this in T51452: EnumProperty fill dynamically using callback.May 11 2017, 7:33 PM

Simon Wendsche (BYOB) mentioned this in T53509: Datablock ID Properties attached to bpy.types.Material are not saved (or loaded).Dec 8 2017, 12:10 PM

Revision Contents
Changeset List

Path

Size

release/

scripts/

startup/

bl_ui/

space_view3d_toolbar.py

48 lines

source/

blender/

blenkernel/

13 lines

2 lines

2 lines

20 lines

2 lines

intern/

2 lines

5 lines

117 lines

119 lines

30 lines

2 lines

5 lines

29 lines

9 lines

9 lines

blenloader/

intern/

readfile.c

219 lines

versioning_defaults.c

24 lines

editors/

include/

UI_interface.h

2 lines

interface/

interface.c

2 lines

interface_intern.h

2 lines

interface_regions.c

17 lines

interface_templates.c

5 lines

object/

object_relations.c

30 lines

sculpt_paint/

22 lines

1 line

1 line

1810 lines

259 lines

231 lines

makesdna/

2 lines

4 lines

3 lines

3 lines

makesrna/

RNA_access.h

2 lines

RNA_define.h

1 line

RNA_types.h

2 lines

intern/

6 lines

76 lines

2 lines

13 lines

1 line

1 line

9 lines

1 line

1 line

1 line

python/

generic/

idprop_py_api.c

14 lines

intern/

4 lines

133 lines

1 line

44 lines

windowmanager/

intern/

wm.c

2 lines

tests/

python/

CMakeLists.txt

8 lines

bl_pyapi_idprop_datablock.py

334 lines

Commit	Tree	Parents	Author	Summary	Date
f7243d612db4	93ae9c65b924	8d520f5e1c04	Campbell Barton	Cleanup: quiet unused warning	Apr 10 2017, 10:01 AM
8d520f5e1c04	91ca39af9b45	f353dc00ab8c	Campbell Barton	Datablock ID Properties (Show More…)	Apr 10 2017, 9:38 AM
f353dc00ab8c	7e71887ab60b	fe9e87e27447	Campbell Barton	Cleanup: Avoid redundant/accidental struct copying	Apr 10 2017, 7:51 AM
fe9e87e27447	828c008317ec	9ef8bee82a85	Campbell Barton	Cleanup: move BKE_pbvh_vertex_iter_end into same scope as… (Show More…)	Apr 10 2017, 7:35 AM
9ef8bee82a85	96128be48892	6daa6acdf16e	Campbell Barton	Cleanup: variable names, const correctness, formatting (Show More…)	Apr 10 2017, 7:17 AM
6daa6acdf16e	47afba209f24	492a2a1d717c	Campbell Barton	Cleanup: move WPaintData, VPaintData, WeightPaintInfo back into paint_vertex.c (Show More…)	Apr 10 2017, 5:57 AM
492a2a1d717c	9335265a2b0b	3ead74716ac6	Campbell Barton	Cleanup: headers	Apr 10 2017, 5:41 AM
3ead74716ac6	d8a366f3503c	f1e26a85ca3f	Campbell Barton	Cleanup: remove redundant headers-in-headers (Show More…)	Apr 10 2017, 5:33 AM
f1e26a85ca3f	19a872e70951	f262adcdd257	Campbell Barton	Cleanup: move inline ViewContext out of vpaint structs (Show More…)	Apr 10 2017, 5:10 AM
f262adcdd257	6849ac4feb81	3386fa37b0fa	Campbell Barton	Cleanup: add OB_MODE_ALL_SCULPT (Show More…)	Apr 10 2017, 4:59 AM
3386fa37b0fa	8084c69818af	68e0a477e940	Campbell Barton	Cleanup: minor syntax/unused var	Apr 10 2017, 4:56 AM
68e0a477e940	e4ac269aacbe	f0990a85f690	Campbell Barton	Cleanup: remove redundant nested header	Apr 10 2017, 4:47 AM
f0990a85f690	ca7db48585c2	da4a679ed518	Campbell Barton	De-duplicate vpaint symmetry draw functions (Show More…)	Apr 10 2017, 4:40 AM
da4a679ed518	74eab922d456	d6164c5396fd 5b873c8c24bf	Campbell Barton	Merge branch 'master' into soc-2016-pbvh-painting	Apr 10 2017, 4:22 AM
d6164c5396fd	58912df0a7e8	60889291006e	Bastien Montagne	Fix building on gcc.	Apr 5 2017, 3:33 PM
60889291006e	f03e4e453a96	e7efe5c4b0f3 6c3d8fbeb399	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Apr 5 2017, 12:15 PM
e7efe5c4b0f3	46a04c527130	38b504520565	Nathan Vollmer	added union in sculpt session for modes. Sculpt fields could use some tidying… (Show More…)	Apr 5 2017, 12:11 PM
38b504520565	5f219c417b13	0f00ede65cca	Nathan Vollmer	fixed masking bug, & pbvh freeing bug. Still trying to figure out grids...	Apr 5 2017, 7:00 AM
0f00ede65cca	18f8664126d3	bb745661aa49	Nathan Vollmer	Fixed vertex selection being ignored.	Jan 10 2017, 6:18 AM
bb745661aa49	45d5f22fa649	12c8e10c3989	Nathan Vollmer	Added a comment	Dec 18 2016, 5:38 AM
12c8e10c3989	dcb798e3148a	f688adb282b2	Nathan Vollmer	Fixed multires bug.	Dec 18 2016, 5:29 AM
f688adb282b2	700bf669c59f	84ba6ef14ab0 535298eea5fd	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Dec 17 2016, 2:03 AM
84ba6ef14ab0	c066ee69c4cf	73c2d6d09045	Bastien Montagne	Cleanup some more indentations...	Dec 16 2016, 10:18 AM
73c2d6d09045	3451833ba0b2	d9f9eeb39db6 4df75e536a08	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Dec 16 2016, 9:07 AM
d9f9eeb39db6	8841a7ff3b8c	b6058f69a9e8	Nathan Vollmer	fixed c++ comments to be c style. Fixed indentation.	Dec 15 2016, 2:41 AM
b6058f69a9e8	6cd149696310	dc5786294882 741c4082d822	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Dec 15 2016, 2:09 AM
dc5786294882	e02d0067569f	c050ea3902bf	Nathan Vollmer	Fixed bug where projection handle for vertex paint wasn't being allocated… (Show More…)	Nov 30 2016, 7:48 PM
c050ea3902bf	91338224a615	b5d2473730d4 df63195d2a7b	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Nov 30 2016, 4:26 PM
b5d2473730d4	9b0e3e7f1357	b405a2e4c0ad	Bastien Montagne	Cleanup: remove include of ED_view3d.h from paint_intern.h (Show More…)	Nov 28 2016, 12:27 PM
b405a2e4c0ad	0479fa411547	6cf6ed563d32	Bastien Montagne	Cleanup: get rid of unused functions and vars, and indentation fixes.	Nov 28 2016, 12:20 PM
6cf6ed563d32	9d42c744fc55	4c32bcca4027 96ed2b0ce05a	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Nov 28 2016, 11:28 AM
4c32bcca4027	947d1c115f03	c78c9629e51a	Nathan Vollmer	Modiffied vertex paint's done step to be more efficient. WPaint could use a… (Show More…)	Sep 25 2016, 2:29 AM
c78c9629e51a	7332a781a14d	b1661f32c9bc a070a5befa11	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Sep 24 2016, 11:37 PM
b1661f32c9bc	99bc96ed7935	ead469c83b62 e156abe467bc	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Sep 15 2016, 8:03 PM
ead469c83b62	dfe562e5d7cd	0fac021c2165 88ddf296bbc9	Nathan Vollmer	Merge branch 'soc-2016-pbvh-painting' of git.blender.org:blender into soc-2016… (Show More…)	Sep 14 2016, 1:47 AM
0fac021c2165	670238fcbc66	ccaca716aef7	Nathan Vollmer	Refactoring	Sep 14 2016, 1:47 AM
88ddf296bbc9	e40dac1674da	b67957a9f3a2	Bastien Montagne	Cleanup: Reduce diff from master (mostly emty lines...).	Sep 13 2016, 2:13 PM
b67957a9f3a2	9bc09a48fdc9	81a15951f45b f38f7874488d	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Sep 13 2016, 2:05 PM
81a15951f45b	316877825703	ccaca716aef7 56c798ee6207	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Sep 13 2016, 8:49 AM
ccaca716aef7	525103ad12f5	dad3e97829e3	Nathan Vollmer	Fixed pen sensitivity bug.	Sep 13 2016, 8:04 AM
dad3e97829e3	7ed5be86fc3e	91d72d786580 95cb71451141	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Sep 3 2016, 8:55 PM
91d72d786580	a725bfa6c5d4	deff0d3ddb99	Nathan Vollmer	Got foreground-background colors working with vertex paint.	Sep 3 2016, 8:21 PM
deff0d3ddb99	c7d750b64f12	210a3e4239e9	Nathan Vollmer	Forgot to update smudge and blur callbacks.	Sep 3 2016, 11:41 AM
210a3e4239e9	8e9797e2490b	6667273bb18b	Nathan Vollmer	Sped up initial vertex paint click. Something after vertex paint done event is… (Show More…)	Sep 3 2016, 11:26 AM
6667273bb18b	8396886395b6	c24665258da2	Nathan Vollmer	Fixed paint_intern.h header.	Aug 24 2016, 2:18 AM
c24665258da2	dbc1f1524581	423440a5b605	Nathan Vollmer	Made average color arrays cleaner.	Aug 23 2016, 7:30 PM
423440a5b605	86ad0a6604b7	939ca2e474da 62e3849f401c	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Aug 19 2016, 9:09 PM
939ca2e474da	940cae7e713c	996165ac9491	Nathan Vollmer	Removed unnecessary debug code. Forgot to remove some old code.	Aug 19 2016, 9:08 PM
996165ac9491	238a09ad17b8	04c4ea25f269	Nathan Vollmer	Fixed spray mode in vertex paint.	Aug 16 2016, 3:27 AM
04c4ea25f269	705ee76f14ae	4794982f6fc9 c00b2d89911e	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Aug 16 2016, 3:09 AM
4794982f6fc9	0e47814a6198	41050c0dbfda 3e24dc367f44	Nathan Vollmer	refactored some more. This commit also contains texture mode implementation in… (Show More…)	Aug 14 2016, 12:53 AM
41050c0dbfda	280a7bc23c9d	c3ce0d56a6fe	Nathan Vollmer	more refactoring. Removed OpenMP flags since the multithreading support isn't… (Show More…)	Aug 13 2016, 11:20 PM
c3ce0d56a6fe	4a95dcf828a1	06de85843c26	Nathan Vollmer	Got texture paint working with PBVH painting.	Aug 11 2016, 11:47 PM
3e24dc367f44	c3446dbfa2f9	73a738a12cb5	Bastien Montagne	Fix build errors under linux, and cleanup a bunch of warnings.	Aug 12 2016, 6:23 PM
73a738a12cb5	20db606036b3	545d69752ddd bac1279b031f	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Aug 12 2016, 4:28 PM
06de85843c26	ab77a3591643	545d69752ddd 7c3a06c34918	Nathan Vollmer	Added initial PBVH creation for weight painting on toggle. PBVH is visible… (Show More…)	Aug 11 2016, 4:42 AM
545d69752ddd	a78b19b3fe5f	600ce2488c05	Nathan Vollmer	Fixed bug where radial mirror would not work without normal mirror being… (Show More…)	Aug 11 2016, 3:33 AM
600ce2488c05	a09dbc19bddf	4286fbaf5cce	Nathan Vollmer	added spray support to weight paint. Vertex paint spray support is giving me… (Show More…)	Aug 6 2016, 5:32 AM
4286fbaf5cce	348ace2b0bea	2cdbfb53d3c4	Nathan Vollmer	implemented brush normal based splash prevention	Aug 4 2016, 11:51 PM
2cdbfb53d3c4	f7cc160179ac	e49054685514 357480f8c371	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Aug 4 2016, 8:15 PM
e49054685514	2384a76623d3	15a3326f8933 409316434c42	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Aug 4 2016, 8:15 PM
15a3326f8933	e335643a8382	ed9fee860541	Nathan Vollmer	added smudge to wpaint. Fixed some strength issues with wpaint. Still need to… (Show More…)	Jul 31 2016, 8:33 AM
ed9fee860541	18cd252cfd1c	91e0fcee1d53	Nathan Vollmer	Added smudge tool to vertex paint. WPaint implementation coming soon. Fixed… (Show More…)	Jul 31 2016, 3:15 AM
91e0fcee1d53	05c0517c30bd	f0c21cbc833a	Nathan Vollmer	Calculating surface normal and direction for smudge, splash prevention, and… (Show More…)	Jul 30 2016, 9:45 PM
f0c21cbc833a	be2452b3460a	8592e10a43c3 9c6387808590	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting (Show More…)	Jul 22 2016, 4:55 PM
8592e10a43c3	527464e4aebe	0ad6424548ab	Nathan Vollmer	Disregard last commit.	Jul 19 2016, 11:09 AM
0ad6424548ab	768d8037ee11	8a438de61063 8eab7ace3392	Nathan Vollmer	Merge branch 'soc-2016-pbvh-painting' of git.blender.org:blender into soc-2016… (Show More…)	Jul 18 2016, 8:51 PM
8a438de61063	b670e2ecd6bf	59023c609d5f	Nathan Vollmer	Forgot to commit modified toolbar.	Jul 18 2016, 8:50 PM
8eab7ace3392	ee813011bd1a	59023c609d5f 65e7caf950d9	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	Jul 18 2016, 2:55 PM
59023c609d5f	dcc0b74954c1	48402da8f170 a2c82f5e5dfe	Nathan Vollmer	Merged master into branch	Jul 18 2016, 5:45 AM
48402da8f170	44b76afb8958	0772bbfb20f2	Nathan Vollmer	Working on speeding up wpaint somemore. Added average brush. Average brush is… (Show More…)	Jul 18 2016, 5:40 AM
0772bbfb20f2	5f5655aa3b8a	50038e622ea1	Nathan Vollmer	Copying old wpaints every click is slow in wpaint test start, and only is used… (Show More…)	Jul 16 2016, 6:30 AM
50038e622ea1	37fdd5b51d6f	7c44a9e1c499	Nathan Vollmer	Changed weight paint to recycle current colors as previous colors instead of… (Show More…)	Jul 15 2016, 4:26 AM
7c44a9e1c499	0498250f6b4c	fd8a07aa1059	Nathan Vollmer	Got the mirror button working. Got multipaint working again.	Jul 14 2016, 10:07 PM
fd8a07aa1059	eb467d4043df	3b411faa9e27	Nathan Vollmer	weight paint is now fading out according to the curve settings. Doing a partial… (Show More…)	Jul 10 2016, 4:24 AM
3b411faa9e27	6a458754d344	a3a084111041	Nathan Vollmer	Rough weight painting working. Fade coming soon.	Jul 10 2016, 2:28 AM
a3a084111041	98ced2ede9c4	e4924c45d4c4	Nathan Vollmer	Added mirror buttons to weight paint, and added pbvh leaf selection and… (Show More…)	Jul 10 2016, 12:23 AM
e4924c45d4c4	f90cad3f4239	17074c2871a7 3fb2c1e4a2f9	Nathan Vollmer	merged master	Jul 8 2016, 1:36 AM
17074c2871a7	233f62c35ad5	df349b04e057	Nathan Vollmer	merged master, but something in the merge broke my windows build, so I had to… (Show More…)	Jul 2 2016, 2:59 AM
df349b04e057	f373dec7027b	4e623b380e5b 5c249fac9a4c	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Jul 2 2016, 2:19 AM
4e623b380e5b	5e077bcd40e7	f5b298e4f291	Nathan Vollmer	Added mirror painting and radial symmetry.	Jul 2 2016, 2:17 AM
f5b298e4f291	c9bcfcf732b5	62227a80ecdd	Nathan Vollmer	Fixed undo bug.	Jul 1 2016, 8:50 PM
62227a80ecdd	9acd092ba523	4b0aeaf327d3 63bbb02559d9	Nathan Vollmer	Merge branch 'soc-2016-pbvh-painting' of git.blender.org:blender into soc-2016… (Show More…)	Jul 1 2016, 12:12 AM
63bbb02559d9	26bd903aad1c	fe95b6c33d8b	Nathan Vollmer	Moved maps out of strokecache and into sculptsession.	Jun 25 2016, 11:48 PM
fe95b6c33d8b	3e37169418b4	ac28364e8bdb	Nathan Vollmer	Brought back traditional blur, renamed new blur to average, and added an… (Show More…)	Jun 25 2016, 2:39 AM
ac28364e8bdb	98758cdf2459	7d68af89009b	Nathan Vollmer	Commented out some old code which made the average brush slow. Created a vert… (Show More…)	Jun 24 2016, 9:14 PM
7d68af89009b	87a3665d9b9f	2976b3b34cf0	Nathan Vollmer	Moved map creation into the toggle.	Jun 24 2016, 1:43 AM
2976b3b34cf0	83e284a88bc5	f34bbcf66e20	Nathan Vollmer	Moved some code around. Got brush strength working.	Jun 24 2016, 12:06 AM
f34bbcf66e20	ccefaaeb3c05	37507d8a5d72	Nathan Vollmer	Fixed a bug where some vertices under the brush wouldn't paint.	Jun 23 2016, 11:01 PM
37507d8a5d72	cd7d4c126216	0aaea4ba2d37 2af4c80be6d1	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Jun 23 2016, 8:04 PM
0aaea4ba2d37	1d3e950516ea	d66126122394	Nathan Vollmer	Fixed memory leak on map.	Jun 23 2016, 8:03 PM
d66126122394	5ba008a822e5	2bc9197981f1 7da189b4e8b1	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Jun 19 2016, 5:59 AM
2bc9197981f1	2607b79cd81a	9930f7ed3384	Nathan Vollmer	Forgot to free stroke cache. Something isn't quite right with vert to loop… (Show More…)	Jun 19 2016, 5:59 AM
9930f7ed3384	20fbedd27e4d	bc8e4c786e2f	Nathan Vollmer	Added blur, although I might rename this tool as smudge and make a seperate… (Show More…)	Jun 19 2016, 5:16 AM
bc8e4c786e2f	c68fb084b507	189a4bc50295	Nathan Vollmer	Fixed a bug that was preventing me from implementing the blur functionality. (Show More…)	Jun 18 2016, 1:28 PM
189a4bc50295	a326a71b4494	e8e8dcc84015 7ac126e728a5	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Jun 18 2016, 10:29 AM
e8e8dcc84015	dea7b7176b0b	3e646349140e	Nathan Vollmer	Did a little cleanup. Noticed I	Jun 18 2016, 10:28 AM
3e646349140e	a023d5a18ca6	6ada8c18cf09 57cff46cec95	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Jun 16 2016, 10:40 AM
6ada8c18cf09	940bec4f901c	fc9f6b216cd6	Nathan Vollmer	Updated map to be more efficient. Fixed bug with brush radius. Next, looking… (Show More…)	Jun 16 2016, 10:39 AM
fc9f6b216cd6	d56714b56b2a	a9500e1a4c09	Nathan Vollmer	Now free'ing maps. Removed unused function.	Jun 12 2016, 7:20 AM
a9500e1a4c09	641e356bb22c	7fa46fa9b028	Nathan Vollmer	Added support for painting multiple leaves at the same time. Also added brush… (Show More…)	Jun 12 2016, 6:59 AM
7fa46fa9b028	c01eacd31a71	7f2c122ca972 07925b63160e	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Jun 11 2016, 12:42 PM
7f2c122ca972	e0d13dd6907d	699329910c3b	Nathan Vollmer	Preliminary PBVH painting on vertex paint. Should have weight painting at a… (Show More…)	Jun 11 2016, 12:41 PM
699329910c3b	355aa125c574	1733e58ee3f4 9d090ed1cde2	Nathan Vollmer	Merge branch 'master' into soc-2016-pbvh-painting	Jun 6 2016, 5:55 AM
1733e58ee3f4	3cb06f78243d	59c31082ccc4	Nathan Vollmer	Added PBVH leaf painting to vertex paint. Weight painting not implemented, but… (Show More…)	Jun 5 2016, 9:20 AM
59c31082ccc4	d07431f6f29e	7c09186ab180	Nathan Vollmer	Quick bug fix causing sculptcache to crash sculpt.	Jun 1 2016, 7:25 AM
7c09186ab180	6bc3ef54a51b	be20f17de4cb	Nathan Vollmer	separated sculpt and vwpaint init stroke cache variants and invariants. Now… (Show More…)	May 28 2016, 2:45 AM
be20f17de4cb	d1dcecfd13e6	cea843c83aa9	Nathan Vollmer	Alloc'd/free'd a stroke cache in both vertex and weight paint toggles.	May 27 2016, 6:02 AM
cea843c83aa9	4ba9fbb8adcf	977c6b2316ef	Nathan Vollmer	Moved StrokeCache to sculpt_intern.h and included sculpt_intern.h in… (Show More…)	May 27 2016, 5:22 AM
977c6b2316ef	fd441b794a4a	67c8ea826b7e	Bastien Montagne	Remove call to BKE_pbvh_draw from draw_mesh_paint, add pbvh BB drawing to dm's… (Show More…)	May 25 2016, 12:05 PM
67c8ea826b7e	34453e7021fb	e2f8970d50d0 15911eebdab1	Bastien Montagne	Merge branch 'master' into soc-2016-pbvh-painting	May 25 2016, 11:34 AM
e2f8970d50d0	d361e17664ac	ec23aff35918	Nathan Vollmer	Changed PBVH material to match sculpt mode.	May 25 2016, 12:23 AM
ec23aff35918	86c412187f7b	837db36d66b6	Nathan Vollmer	Added PBVH & drawing to vertex paint. Now free'ing when vertex/weight paint is… (Show More…)	May 25 2016, 12:04 AM
837db36d66b6	ade00b7e8902	5c5ee7c22894	Nathan Vollmer	Copied PBVH painting from dm->drawFacesSolid to draw_mesh_paint.	May 23 2016, 11:39 PM
5c5ee7c22894	8753c45e741f	29a17d54da1f	Nathan Vollmer	Added initial PBVH creation for weight painting on toggle. PBVH is visible… (Show More…)	May 23 2016, 5:42 AM