diff options
| author | Yiming Wu <xp8110@outlook.com> | 2018-12-07 17:53:30 +0300 |
|---|---|---|
| committer | Yiming Wu <xp8110@outlook.com> | 2018-12-07 17:53:30 +0300 |
| commit | 9fc81d8cea36a3d9a6862ac469b8973aaec703d1 (patch) | |
| tree | 66397db07c817a71f71d02cef58be69e8443c7c9 /source/blender/modifiers/CMakeLists.txt | |
| parent | a1a526e5576384aade7aec3d66ed00886911d337 (diff) | |
| parent | 32d50858c353734124f68fd71b66f46ed2cb2ceb (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr
# Conflicts:
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_data_camera.py
# release/scripts/startup/bl_ui/properties_material.py
# release/scripts/startup/bl_ui/properties_particle.py
# release/scripts/startup/bl_ui/properties_physics_common.py
# release/scripts/startup/bl_ui/properties_physics_rigidbody.py
# release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
# release/scripts/startup/bl_ui/properties_physics_softbody.py
# release/scripts/startup/bl_ui/properties_scene.py
# release/scripts/startup/bl_ui/properties_view_layer.py
# release/scripts/startup/bl_ui/properties_world.py
# source/blender/draw/intern/draw_manager.c
# source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/modifiers/CMakeLists.txt')
| -rw-r--r-- | source/blender/modifiers/CMakeLists.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 983c07d9e48..a17ea929ef8 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -145,10 +145,6 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -if(WITH_OPENSUBDIV_MODIFIER) - add_definitions(-DWITH_OPENSUBDIV_MODIFIER) -endif() - # So we can have special tricks in modifier system. add_definitions(${GL_DEFINITIONS}) |