diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-08-26 12:18:41 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-08-26 12:18:41 +0300 |
| commit | c44251c7d705015f40d2e73d703c7ae3a99178ba (patch) | |
| tree | 0d05a110c29a974f638f12f35f1c8ffff14f12f1 /source/blender | |
| parent | 0e50b6529cf8b43d4ff7a738bf201e6058ca5ba6 (diff) | |
| parent | 8ddf8cfa6f3af7e59396986b81e49bd013bf9336 (diff) | |
Merge remote-tracking branch 'origin/blender-v2.90-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 6254e40a410..ad43202d850 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -455,10 +455,10 @@ void RNA_def_main_cachefiles(BlenderRNA *brna, PropertyRNA *cprop); void RNA_def_main_paintcurves(BlenderRNA *brna, PropertyRNA *cprop); void RNA_def_main_workspaces(BlenderRNA *brna, PropertyRNA *cprop); void RNA_def_main_lightprobes(BlenderRNA *brna, PropertyRNA *cprop); -#ifdef WITH_PARTICLE_NODES +#ifdef WITH_HAIR_NODES void RNA_def_main_hairs(BlenderRNA *brna, PropertyRNA *cprop); #endif -#ifdef WITH_HAIR_NODES +#ifdef WITH_PARTICLE_NODES void RNA_def_main_pointclouds(BlenderRNA *brna, PropertyRNA *cprop); #endif void RNA_def_main_volumes(BlenderRNA *brna, PropertyRNA *cprop); |