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>2016-01-07 23:52:54 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-01-07 23:52:54 +0300
commit261ac69f57a9daac370f0a25af955d725d6c77be (patch)
treef14c5e6500dd0230a3f8710ce45c8017e08e6cc4 /intern/cycles/blender/blender_util.h
parente63c773b7c7cc3cd4db1ee986942818f2a675c3e (diff)
Fix RNA_enum_set_identifier(), needs a context to handle correctly dynamic enums.
Diffstat (limited to 'intern/cycles/blender/blender_util.h')
-rw-r--r--intern/cycles/blender/blender_util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_util.h b/intern/cycles/blender/blender_util.h
index a1508fc6a07..56ac5d1c4ba 100644
--- a/intern/cycles/blender/blender_util.h
+++ b/intern/cycles/blender/blender_util.h
@@ -363,7 +363,7 @@ static inline void set_enum(PointerRNA& ptr, const char *name, int value)
static inline void set_enum(PointerRNA& ptr, const char *name, const string &identifier)
{
- RNA_enum_set_identifier(&ptr, name, identifier.c_str());
+ RNA_enum_set_identifier(NULL, &ptr, name, identifier.c_str());
}
static inline string get_string(PointerRNA& ptr, const char *name)