diff options
author | mattoverby <mattoverby@gmail.com> | 2020-08-19 17:09:16 +0300 |
---|---|---|
committer | mattoverby <mattoverby@gmail.com> | 2020-08-19 17:09:16 +0300 |
commit | 58c6fc17b106a347b2e373b7f042343a78b88fc2 (patch) | |
tree | 7b16ac43c76a0150f70e6a71196dbd27047e73c3 /source/blender/makesrna/intern/rna_object.c | |
parent | 293459925aa849bc4c42efb28a54a0c79d14ae89 (diff) | |
parent | aa1e4baa22b3393dc723d48061c9781f4b8b42c7 (diff) |
merged from master
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 08ca3f16b6d..39e1f17d33d 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -570,9 +570,17 @@ static StructRNA *rna_Object_data_typef(PointerRNA *ptr) case OB_GPENCIL: return &RNA_GreasePencil; case OB_HAIR: +# ifdef WITH_HAIR_NODES return &RNA_Hair; +# else + return &RNA_ID; +# endif case OB_POINTCLOUD: +# ifdef WITH_PARTICLE_NODES return &RNA_PointCloud; +# else + return &RNA_ID; +# endif case OB_VOLUME: return &RNA_Volume; default: |