diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 15:05:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 15:05:35 +0300 |
commit | ee1d2adc1685b4aea3a02155379bc02b9298acc9 (patch) | |
tree | 53205d0a4b643b706b353290ff804fe043bded22 /source/blender/makesrna/RNA_types.h | |
parent | 855b83caece3bf95443852ce5e73a8e759273a7d (diff) |
partial fix for [#23532]
- Python calling operators didn't run WM_operator_properties_sanitize() so enum functions called from python were given a NULL context.
- PROP_ENUM_NO_CONTEXT and PROP_NEVER_NULL used the same value in the enum (possible conflict).
Diffstat (limited to 'source/blender/makesrna/RNA_types.h')
-rw-r--r-- | source/blender/makesrna/RNA_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 5caae56010f..3fafae00ca6 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -192,7 +192,7 @@ typedef enum PropertyFlag { PROP_RAW_ARRAY = 1<<14, PROP_FREE_POINTERS = 1<<15, PROP_DYNAMIC = 1<<17, /* for dynamic arrays, and retvals of type string */ - PROP_ENUM_NO_CONTEXT = 1<<18 /* for enum that shouldn't be contextual */ + PROP_ENUM_NO_CONTEXT = 1<<24 /* for enum that shouldn't be contextual */ } PropertyFlag; typedef struct CollectionPropertyIterator { |