[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27232] trunk/blender: fix for last commit (overcommited files).

[Dalai Felinto]

Revision: 27232
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27232
Author:   dfelinto
Date:     2010-03-03 07:45:54 +0100 (Wed, 03 Mar 2010)

Log Message:
-----------
fix for last commit (overcommited files).

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2010-03-03 06:38:47 UTC (rev 27231)
+++ trunk/blender/CMakeLists.txt	2010-03-03 06:45:54 UTC (rev 27232)
@@ -61,7 +61,7 @@
 OPTION(WITH_GAMEENGINE    "Enable Game Engine" ON)
 OPTION(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
-OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" OFF)
 OPTION(WITH_QUICKTIME     "Enable Quicktime Support" OFF)
 OPTION(WITH_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
 OPTION(WITH_DDS           "Enable DDS Support" ON)
@@ -117,7 +117,7 @@
 
 IF(UNIX AND NOT APPLE)
 
-
+	SET(CMAKE_EDIT_COMMAND "/use/bin/cmake -i")
 	IF(WITH_OPENAL)
 		FIND_PACKAGE(OpenAL)
 		IF(OPENAL_FOUND)
@@ -261,7 +261,7 @@
 	# this file is included anyway when building under Windows with cl.exe
 	#  INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
   
-	SET(LIBDIR ${CMAKE_SOURCE_DIR}/../../../lib/windows)
+  SET(LIBDIR ${CMAKE_SOURCE_DIR}/../../lib/windows)
 
 	# Setup 64bit and 64bit windows systems
 	IF(CMAKE_CL_64)

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-03-03 06:38:47 UTC (rev 27231)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-03-03 06:45:54 UTC (rev 27232)
@@ -2246,6 +2246,7 @@
 	
 	/* api callbacks */
 	ot->exec= region_flip_exec;
+	ot->modal= 
 	
 	ot->poll= ED_operator_areaactive;
 	ot->flag= 0;