- fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

- move test -> tests, this name is used elsewhere in lib/tests.
- change interface code not to loop on a float value (clang warning), harmless, but with extreme cases an eternal loop would still be possible though unlikely.
This commit is contained in:
Campbell Barton 2011-01-23 11:42:29 +00:00
parent 552b36733b
commit d75216ba1c
8 changed files with 9 additions and 6 deletions

@ -35,4 +35,4 @@ if(WINDOWS)
add_subdirectory(icons)
endif()
add_subdirectory(test)
add_subdirectory(tests)

@ -1576,6 +1576,7 @@ void uiDrawBoxShadow(unsigned char alpha, float minx, float miny, float maxx, fl
void ui_dropshadow(rctf *rct, float radius, float aspect, int select)
{
int i;
float rad;
float a;
char alpha= 2;
@ -1587,8 +1588,9 @@ void ui_dropshadow(rctf *rct, float radius, float aspect, int select)
else
rad= radius;
if(select) a= 12.0f*aspect; else a= 12.0f*aspect;
for(; a>0.0f; a-=aspect) {
i= 12;
if(select) a= i*aspect; else a= i*aspect;
for(; i--; a-=aspect) {
/* alpha ranges from 2 to 20 or so */
glColor4ub(0, 0, 0, alpha);
alpha+= 2;

@ -305,6 +305,7 @@ if(WITH_INSTALL)
endif()
if(WITH_PYTHON)
# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
if(NOT CMAKE_BUILD_TYPE) # hack: with multi-configuration generator this is "", so for now copy both python31.dll/zip and python31_d.dll/zip
add_custom_command(TARGET blender
POST_BUILD
@ -322,7 +323,7 @@ if(WITH_INSTALL)
COMMAND if \"$(ConfigurationName)\" == \"MinSizeRel\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
)
else()
if(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
if(CMAKE_BUILD_TYPE STREQUAL Debug)
add_custom_command(TARGET blender
POST_BUILD
MAIN_DEPENDENCY blender

@ -81,7 +81,7 @@ add_test(export_obj_all_objects ${EXECUTABLE_OUTPUT_PATH}/blender ${GENERIC_ARGS
--run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/export_obj_all_objects.obj',use_selection=False,use_nurbs=True\)
--md5_source=${TEST_OUT_DIR}/export_obj_all_objects.obj
--md5_source=${TEST_OUT_DIR}/export_obj_all_objects.mtl
--md5=c835899ca8993495af8a13c2f229629b --md5_method=FILE
--md5=6e033a6a9c923d7aa3613b36e373f55b --md5_method=FILE
)