diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-19 01:02:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-19 01:02:59 +0400 |
| commit | c9233bfd828f6e37e1c6e492e4e835dae01288d7 (patch) | |
| tree | 747bd94255dd33602b233564b54c2d3aa8760f40 /intern | |
| parent | acecae86dc8d4e59d373c73fb6abbdc276a98896 (diff) | |
Code cleanup: style
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 4 | ||||
| -rw-r--r-- | intern/locale/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 3920510e38f..e267ea48b73 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -107,7 +107,7 @@ enum_integrator = ( ('BRANCHED_PATH', "Branched Path Tracing", "Path tracing integrator that branches on the first bounce, giving more control over the number of light and material samples"), ('PATH', "Path Tracing", "Pure path tracing integrator"), ) - + enum_volume_homogeneous_sampling = ( ('DISTANCE', "Distance", "Use Distance Sampling"), ('EQUI_ANGULAR', "Equi-angular", "Use Equi-angular Sampling"), @@ -145,7 +145,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): items=enum_integrator, default='PATH', ) - + cls.volume_homogeneous_sampling = EnumProperty( name="Homogeneous Sampling", description="Sampling method to use for homogeneous volumes", diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt index 6f3b6a695b6..4dc447391fc 100644 --- a/intern/locale/CMakeLists.txt +++ b/intern/locale/CMakeLists.txt @@ -53,7 +53,7 @@ set(MSFFMT_SRC ) add_executable(msgfmt ${MSFFMT_SRC}) -if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND (CMAKE_C_COMPILER_VERSION VERSION_EQUAL 3.4 OR CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.4)) +if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND (NOT (CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4))) # needed for clang 3.4+ target_link_libraries(msgfmt ${PLATFORM_LINKLIBS}) endif() |