From 87ceff3d1b5805658622a314a84620b52ab98c7d Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 23 Jun 2020 11:30:46 +0200 Subject: Preferences: New experimental settings for particle system and hair This replaces the cmake options `WITH_NEW_OBJECT_TYPES` and `WITH_NEW_SIMULATION_TYPE` with two experimental userpref settings: * `use_new_particle_system`: Enables the point cloud type and the simulation editor. * `use_new_hair_type`: Only displays the add-operator in the add menu for now. Note, in the current state you can't do anything productive with the new particle system or the new hair type. Features will be added step by step in the upcoming weeks and months. Reviewers: brecht Differential Revision: https://developer.blender.org/D8096 --- source/blender/makesrna/intern/CMakeLists.txt | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'source/blender/makesrna/intern/CMakeLists.txt') diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index dd7f5f684e7..980e3eadd34 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -47,6 +47,7 @@ set(DEFSRC rna_fluid.c rna_gpencil.c rna_gpencil_modifier.c + rna_hair.c rna_image.c rna_key.c rna_lattice.c @@ -77,9 +78,11 @@ set(DEFSRC rna_sculpt_paint.c rna_sequencer.c rna_shader_fx.c + rna_simulation.c rna_sound.c rna_space.c rna_speaker.c + rna_pointcloud.c rna_test.c rna_text.c rna_texture.c @@ -96,20 +99,6 @@ set(DEFSRC rna_xr.c ) -if(WITH_NEW_OBJECT_TYPES) - list(APPEND DEFSRC - rna_hair.c - rna_pointcloud.c - ) -endif() - -if (WITH_NEW_SIMULATION_TYPE) - list(APPEND DEFSRC - rna_simulation.c - ) -endif() - - set(APISRC rna_action_api.c rna_animation_api.c @@ -345,15 +334,6 @@ if(WITH_XR_OPENXR) add_definitions(-DWITH_XR_OPENXR) endif() -if(WITH_NEW_OBJECT_TYPES) - add_definitions(-DWITH_NEW_OBJECT_TYPES) -endif() - -if (WITH_NEW_SIMULATION_TYPE) - add_definitions(-DWITH_NEW_SIMULATION_TYPE) -endif() - - # Build makesrna executable blender_include_dirs( . -- cgit v1.2.3