Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-05-01 16:24:17 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-05-02 10:54:42 +0300
commit9e87069c3ec4c4327f0d2e8c2c450436cd7866a0 (patch)
tree9ec2192bf544e3a14ff0dd71ab29043d28095db7 /source/blender/makesrna/RNA_types.h
parentc052346fbf0e3bdfdd9dd48669985ea065e07185 (diff)
Static override: initial work for generating 'insertion' in collections.
Does not yet support applying those operations, only detecting insertions and generating matching rules was already rather complicated. Also got rid of ;ost rna_path string allocation in collection diffing code, could help a bit with speed too.
Diffstat (limited to 'source/blender/makesrna/RNA_types.h')
-rw-r--r--source/blender/makesrna/RNA_types.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 77d9aabd661..5d6f309ad65 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -158,7 +158,7 @@ typedef enum PropertySubType {
/* Make sure enums are updated with these */
/* HIGHEST FLAG IN USE: 1 << 31
- * FREE FLAGS: 9, 11, 13, 14, 15, 30 */
+ * FREE FLAGS: 11, 13, 14, 15, 30 */
typedef enum PropertyFlag {
/* editable means the property is editable in the user
* interface, properties are editable by default except
@@ -178,6 +178,8 @@ typedef enum PropertyFlag {
/* Means the property can be overriden by a local 'proxy' of some linked datablock. */
PROP_OVERRIDABLE_STATIC = (1 << 2),
+ /* The property supports insertion (collections only). */
+ PROP_OVERRIDABLE_STATIC_INSERTION = (1 << 9),
/* Forbid usage of this property in comparison (& hence override) code.
* Useful e.g. for collections of data like mesh's geometry, particles, etc. */