diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-08-18 15:55:44 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-08-18 15:55:44 +0300 |
| commit | 8ab0d0e3990881bf66e9cdd2f62cd2a464015496 (patch) | |
| tree | 11dd79c2b6b648eddbb9c4fffe5d66152db52134 /source/blender/makesrna/intern/rna_object.c | |
| parent | c526a34fc2fe0d51a81837bd49dbc0b78c8b5224 (diff) | |
| parent | 83e3d25bcae37df0139bb93b85d7ae5bf3da553b (diff) | |
Merge remote-tracking branch 'origin/blender-v2.90-release'
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: |