[Bf-blender-cvs] [aa53d26c0e] id_override_static: Merge branch 'master' into id_override_static

[Bastien Montagne]

Commit: aa53d26c0e01a146ee8cd926231a9c2a4f75660e
Author: Bastien Montagne
Date:   Thu Jan 12 12:58:57 2017 +0100
Branches: id_override_static
https://developer.blender.org/rBaa53d26c0e01a146ee8cd926231a9c2a4f75660e

Merge branch 'master' into id_override_static

Conflicts:
	source/blender/makesrna/RNA_types.h

===================================================================



===================================================================

diff --cc source/blender/makesrna/RNA_types.h
index 4b9b5aaf50,dee8df7d93..5669fca233
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@@ -174,11 -174,10 +174,13 @@@ typedef enum PropertyFlag 
  	 * and collections */
  	PROP_ANIMATABLE              = (1 << 1),
  
 +	/* Means the property can be overriden by a local 'proxy' of some linked datablock. */
 +	PROP_OVERRIDABLE             = (1 << 2),
 +
- 	/* This flag means when the property's widget is in 'textedit' mode, it will be updated after every typed char,
- 	 * instead of waiting final validation. Used e.g. for text searchbox. */
+ 	/* This flag means when the property's widget is in 'textedit' mode, it will be updated
+ 	 * after every typed char, instead of waiting final validation. Used e.g. for text searchbox.
+ 	 * It will also cause UI_BUT_VALUE_CLEAR to be set for text buttons. We could add an own flag
+ 	 * for search/filter properties, but this works just fine for now. */
  	PROP_TEXTEDIT_UPDATE         = (1 << 31),
  
  	/* icon */