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

Dalai Felinto dfelinto at gmail.com
Wed Mar 3 07:54:55 CET 2010


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

Log Message:
-----------
fix for last commit (overcommited files). the right fix now :/

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:45:54 UTC (rev 27232)
+++ trunk/blender/CMakeLists.txt	2010-03-03 06:54:55 UTC (rev 27233)
@@ -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)" OFF)
+OPTION(WITH_ELBEEM        "Enable Elbeem (Fluid Simulation)" ON)
 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:45:54 UTC (rev 27232)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-03-03 06:54:55 UTC (rev 27233)
@@ -2251,53 +2251,7 @@
 	ot->poll= ED_operator_areaactive;
 	ot->flag= 0;
 }
-/* ************** header pan to left + mouse over editor changes operator ***************************** */
-// This is a hacky, or a workaround if you prefer
-// I like being able to quickly switch Editors (ALT+MOUSEWHEEL)
-// Since the editor switcher is not always visible (and it should IMHO) this operator helps you with that :)
 
-static int header_focus_exec(bContext *C, wmOperator *op)
-{
-	int i;
-	int bounds[4] = {0,20,0,0};
-	ARegion *ar= CTX_wm_region(C);
-
-	/* find the header region 
-	 *	- try context first, but upon failing, search all regions in area...
-	 */
-	if((ar == NULL) || (ar->regiontype != RGN_TYPE_HEADER)) {
-		ScrArea *sa= CTX_wm_area(C);
-		
-		/* loop over all regions until a matching one is found */
-		for (ar= sa->regionbase.first; ar; ar= ar->next) {
-			if(ar->regiontype == RGN_TYPE_HEADER)
-				break;
-		}
-		
-		/* don't do anything if no region */
-		if(ar == NULL)
-			return OPERATOR_CANCELLED;
-	}
-	for (i =0; i <40; i++){
-		WM_operator_name_call(C, "VIEW2D_OT_scroll_left", WM_OP_INVOKE_DEFAULT, NULL);
-	}
-	
-	return OPERATOR_FINISHED;
-}
-
-static void SCREEN_OT_header_focus(wmOperatorType *ot)
-{
-	/* identifiers */
-	ot->name= "Header Focus";
-	ot->idname= "SCREEN_OT_header_focus";
-	
-	/* api callbacks */
-	ot->exec= header_focus_exec;
-	
-	ot->poll= ED_operator_areaactive;
-	ot->flag= 0;
-}
-
 /* ************** header flip operator ***************************** */
 
 /* flip a header region alignment */
@@ -2372,7 +2326,7 @@
 		uiItemO(layout, "Flip to Bottom", 0, "SCREEN_OT_header_flip");	
 	else
 		uiItemO(layout, "Flip to Top", 0, "SCREEN_OT_header_flip");
-	uiItemO(layout, "Focus on Editor Type", 0, "SCREEN_OT_header_focus");	
+	
 	uiItemS(layout);
 	
 	/* file browser should be fullscreen all the time, but other regions can be maximised/restored... */
@@ -4043,7 +3997,6 @@
 	WM_operatortype_append(SCREEN_OT_region_flip);
 	WM_operatortype_append(SCREEN_OT_header_flip);
 	WM_operatortype_append(SCREEN_OT_header_toolbox);
-	WM_operatortype_append(SCREEN_OT_header_focus);
 	WM_operatortype_append(SCREEN_OT_screen_set);
 	WM_operatortype_append(SCREEN_OT_screen_full_area);
 	WM_operatortype_append(SCREEN_OT_back_to_previous);
@@ -4128,7 +4081,6 @@
 	keymap= WM_keymap_find(keyconf, "Header", 0, 0);
 	
 	WM_keymap_add_item(keymap, "SCREEN_OT_header_toolbox", RIGHTMOUSE, KM_PRESS, 0, 0);
-	WM_keymap_add_item(keymap, "SCREEN_OT_header_focus", MIDDLEMOUSE, KM_PRESS, KM_ALT, 0);
 	
 	/* Screen General ------------------------------------------------ */
 	keymap= WM_keymap_find(keyconf, "Screen", 0, 0);





More information about the Bf-blender-cvs mailing list