Cleanup: whitespace

This commit is contained in:
Campbell Barton
2019-12-16 13:49:11 +11:00
parent 80062e6305
commit 5a97a74c69
22 changed files with 19 additions and 25 deletions

View File

@@ -33,7 +33,3 @@ if(WITH_WINDOWS_BUNDLE_CRT)
set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>") set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>")
endif() endif()
configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY) configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY)

View File

@@ -67,7 +67,7 @@ SET(LEMON_ENABLE_ILOG YES CACHE STRING "Enable ILOG (CPLEX) solver backend.")
SET(LEMON_ENABLE_COIN YES CACHE STRING "Enable COIN solver backend.") SET(LEMON_ENABLE_COIN YES CACHE STRING "Enable COIN solver backend.")
SET(LEMON_ENABLE_SOPLEX YES CACHE STRING "Enable SoPlex solver backend.") SET(LEMON_ENABLE_SOPLEX YES CACHE STRING "Enable SoPlex solver backend.")
IF(LEMON_ENABLE_GLPK) IF(LEMON_ENABLE_GLPK)
FIND_PACKAGE(GLPK 4.33) FIND_PACKAGE(GLPK 4.33)
ENDIF(LEMON_ENABLE_GLPK) ENDIF(LEMON_ENABLE_GLPK)
IF(LEMON_ENABLE_ILOG) IF(LEMON_ENABLE_ILOG)

View File

@@ -4,7 +4,7 @@ FIND_PATH(ILOG_ROOT_DIR
PATHS /opt/ibm/ILOG /usr/local/ibm/ILOG /usr/local/ILOG /usr/local/ilog PATHS /opt/ibm/ILOG /usr/local/ibm/ILOG /usr/local/ILOG /usr/local/ilog
PATHS "$ENV{HOME}/ILOG" "$ENV{HOME}/.local/ILOG" PATHS "$ENV{HOME}/ILOG" "$ENV{HOME}/.local/ILOG"
PATHS "$ENV{HOME}/ibm/ILOG" "$ENV{HOME}/.local/ibm/ILOG" PATHS "$ENV{HOME}/ibm/ILOG" "$ENV{HOME}/.local/ibm/ILOG"
PATHS "C:/Program Files/IBM/ILOG" PATHS "C:/Program Files/IBM/ILOG"
PATH_SUFFIXES "CPLEX_Studio126" "CPLEX_Studio125" PATH_SUFFIXES "CPLEX_Studio126" "CPLEX_Studio125"
"CPLEX_Studio124" "CPLEX_Studio123" "CPLEX_Studio122" "CPLEX_Studio124" "CPLEX_Studio123" "CPLEX_Studio122"
NO_DEFAULT_PATH NO_DEFAULT_PATH

View File

@@ -16,4 +16,3 @@ LINK_DIRECTORIES(
# ADD_EXECUTABLE(myprog myprog-main.cc) # ADD_EXECUTABLE(myprog myprog-main.cc)
# TARGET_LINK_LIBRARIES(myprog lemon) # TARGET_LINK_LIBRARIES(myprog lemon)

View File

@@ -88,4 +88,3 @@ INSTALL(
FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
DESTINATION lib/pkgconfig DESTINATION lib/pkgconfig
) )

View File

@@ -61,4 +61,4 @@ void main()
else { else {
fragColor = vec4(1.0, 0.0, 1.0, 1.0); fragColor = vec4(1.0, 0.0, 1.0, 1.0);
} }
} }

View File

@@ -2354,4 +2354,4 @@ void OVERLAY_pose_draw(OVERLAY_Data *vedata)
DRW_draw_pass(psl->armature_ps[1]); DRW_draw_pass(psl->armature_ps[1]);
} }
} }

View File

@@ -129,4 +129,4 @@ void OVERLAY_edit_curve_draw(OVERLAY_Data *vedata)
DRW_draw_pass(psl->edit_curve_wire_ps[1]); DRW_draw_pass(psl->edit_curve_wire_ps[1]);
DRW_draw_pass(psl->edit_curve_handle_ps); DRW_draw_pass(psl->edit_curve_handle_ps);
} }

View File

@@ -202,4 +202,4 @@ void OVERLAY_edit_text_draw(OVERLAY_Data *vedata)
DRW_draw_pass(psl->edit_text_wire_ps[1]); DRW_draw_pass(psl->edit_text_wire_ps[1]);
DRW_draw_pass(psl->edit_text_overlay_ps); DRW_draw_pass(psl->edit_text_overlay_ps);
} }

View File

@@ -571,4 +571,4 @@ OVERLAY_InstanceFormats *OVERLAY_shader_instance_formats_get(void);
void OVERLAY_shader_free(void); void OVERLAY_shader_free(void);
#endif /* __OVERLAY_PRIVATE_H__ */ #endif /* __OVERLAY_PRIVATE_H__ */

View File

@@ -147,4 +147,4 @@ void main()
fragColor = mix(fragColor, fragColor / fragColor.a, blend); fragColor = mix(fragColor, fragColor / fragColor.a, blend);
} }
#endif #endif
} }

View File

@@ -8,4 +8,4 @@ void main()
float y = float((v & 2) << 1); float y = float((v & 2) << 1);
gl_Position = vec4(x - 1.0, y - 1.0, 1.0, 1.0); gl_Position = vec4(x - 1.0, y - 1.0, 1.0, 1.0);
uvs = vec2(x, y) * 0.5; uvs = vec2(x, y) * 0.5;
} }

View File

@@ -10,4 +10,4 @@ void main()
{ {
fragColor = finalColor; fragColor = finalColor;
lineOutput = pack_line_data(gl_FragCoord.xy, edgeStart, edgePos); lineOutput = pack_line_data(gl_FragCoord.xy, edgeStart, edgePos);
} }

View File

@@ -27,4 +27,4 @@ void main()
#ifdef USE_WORLD_CLIP_PLANES #ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(world_pos); world_clip_planes_calc_clip_distance(world_pos);
#endif #endif
} }

View File

@@ -15,4 +15,4 @@ void main()
* the depth and creating mini-spheres. * the depth and creating mini-spheres.
* Disabled as it has performance impact. */ * Disabled as it has performance impact. */
// gl_FragDepth = gl_FragCoord.z + 1e-6 * fac; // gl_FragDepth = gl_FragCoord.z + 1e-6 * fac;
} }

View File

@@ -17,4 +17,4 @@ void main()
#ifdef USE_WORLD_CLIP_PLANES #ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(world_pos); world_clip_planes_calc_clip_distance(world_pos);
#endif #endif
} }

View File

@@ -27,4 +27,4 @@ void main()
#ifdef USE_WORLD_CLIP_PLANES #ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(world_pos); world_clip_planes_calc_clip_distance(world_pos);
#endif #endif
} }

View File

@@ -224,4 +224,4 @@ void main()
#ifdef USE_WORLD_CLIP_PLANES #ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(world_pos); world_clip_planes_calc_clip_distance(world_pos);
#endif #endif
} }

View File

@@ -28,4 +28,4 @@ void main()
if (fract(dist / dash_width) > dash_factor) { if (fract(dist / dash_width) > dash_factor) {
discard; discard;
} }
} }

View File

@@ -37,4 +37,4 @@ void main()
#ifdef USE_WORLD_CLIP_PLANES #ifdef USE_WORLD_CLIP_PLANES
world_clip_planes_calc_clip_distance(world_pos); world_clip_planes_calc_clip_distance(world_pos);
#endif #endif
} }

View File

@@ -526,4 +526,4 @@ void DRW_text_edit_mesh_measure_stats(ARegion *ar,
} }
} }
} }
} }

View File

@@ -1049,7 +1049,7 @@ setup_liblinks(blender)
# USD registry. # USD registry.
# USD requires a set of JSON files that define the standard schemas. These # USD requires a set of JSON files that define the standard schemas. These
# files are required at runtime. # files are required at runtime.
if (WITH_USD) if(WITH_USD)
add_definitions(-DWITH_USD) add_definitions(-DWITH_USD)
install(DIRECTORY install(DIRECTORY
${LIBDIR}/usd/lib/usd ${LIBDIR}/usd/lib/usd