[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34463] trunk/blender/source: - fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

[Campbell Barton]

Revision: 34463
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34463
Author:   campbellbarton
Date:     2011-01-23 11:42:29 +0000 (Sun, 23 Jan 2011)
Log Message:
-----------
- 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.

Modified Paths:
--------------
    trunk/blender/source/CMakeLists.txt
    trunk/blender/source/blender/editors/interface/interface_draw.c
    trunk/blender/source/creator/CMakeLists.txt
    trunk/blender/source/tests/CMakeLists.txt

Added Paths:
-----------
    trunk/blender/source/tests/

Removed Paths:
-------------
    trunk/blender/source/test/

Modified: trunk/blender/source/CMakeLists.txt
===================================================================
--- trunk/blender/source/CMakeLists.txt	2011-01-23 08:37:34 UTC (rev 34462)
+++ trunk/blender/source/CMakeLists.txt	2011-01-23 11:42:29 UTC (rev 34463)
@@ -35,4 +35,4 @@
 	add_subdirectory(icons)
 endif()
 
-add_subdirectory(test)
+add_subdirectory(tests)

Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c	2011-01-23 08:37:34 UTC (rev 34462)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2011-01-23 11:42:29 UTC (rev 34463)
@@ -1576,6 +1576,7 @@
 
 void ui_dropshadow(rctf *rct, float radius, float aspect, int select)
 {
+	int i;
 	float rad;
 	float a;
 	char alpha= 2;
@@ -1586,9 +1587,10 @@
 		rad= (rct->ymax-rct->ymin-10.0f)/2.0f;
 	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;

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-01-23 08:37:34 UTC (rev 34462)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-01-23 11:42:29 UTC (rev 34463)
@@ -305,6 +305,7 @@
 		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 @@
 					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

Modified: trunk/blender/source/tests/CMakeLists.txt
===================================================================
--- trunk/blender/source/test/CMakeLists.txt	2011-01-22 07:15:44 UTC (rev 34451)
+++ trunk/blender/source/tests/CMakeLists.txt	2011-01-23 11:42:29 UTC (rev 34463)
@@ -81,7 +81,7 @@
 	--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
 )