[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21087] branches/blender2.5/blender/source /blender/python: removing files that should not be in blender2.5, added ( by mistake?) r19226

Campbell Barton ideasman42 at gmail.com
Tue Jun 23 00:32:03 CEST 2009


Revision: 21087
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21087
Author:   campbellbarton
Date:     2009-06-23 00:32:00 +0200 (Tue, 23 Jun 2009)

Log Message:
-----------
removing files that should not be in blender2.5, added (by mistake?) r19226

Removed Paths:
-------------
    branches/blender2.5/blender/source/blender/python/BPY_menus.c
    branches/blender2.5/blender/source/blender/python/BPY_menus.h

Deleted: branches/blender2.5/blender/source/blender/python/BPY_menus.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/BPY_menus.c	2009-06-22 22:02:43 UTC (rev 21086)
+++ branches/blender2.5/blender/source/blender/python/BPY_menus.c	2009-06-22 22:32:00 UTC (rev 21087)
@@ -1,1118 +0,0 @@
-/* 
- * $Id: BPY_menus.c 12932 2007-12-17 20:21:06Z theeth $
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * This is a new part of Blender.
- *
- * Contributor(s): Willian P. Germano, Michael Reimpell
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
-*/
-
-/* 
- *This is the main file responsible for having bpython scripts accessible
- * from Blender menus.  To know more, please start with its header file.
- */
-
-#include "BPY_menus.h"
-
-#include <Python.h>
-#ifndef WIN32
-  #include <dirent.h>
-#else
-  #include "BLI_winstuff.h"
-#endif
-#include "BKE_global.h"
-#include "BKE_utildefines.h"
-#include "BLI_blenlib.h"
-#include "MEM_guardedalloc.h"
-#include "DNA_userdef_types.h"	/* for U.pythondir */
-#include "api2_2x/EXPP_interface.h" /* for bpy_gethome() */
-
-#define BPYMENU_DATAFILE "Bpymenus"
-#define MAX_DIR_DEPTH 4 /* max depth for traversing scripts dirs */
-#define MAX_DIR_NUMBER 30 /* max number of dirs in scripts dirs trees */
-
-static int DEBUG;
-static int Dir_Depth;
-static int Dirs_Number;
-
-/* BPyMenuTable holds all registered pymenus, as linked lists for each menu
- * where they can appear (see PYMENUHOOKS enum in BPY_menus.h).
-*/
-BPyMenu *BPyMenuTable[PYMENU_TOTAL];
-
-static int bpymenu_group_atoi( char *str )
-{
-	if( !strcmp( str, "Export" ) )
-		return PYMENU_EXPORT;
-	else if( !strcmp( str, "Import" ) )
-		return PYMENU_IMPORT;
-	else if( !strcmp( str, "Help" ) )
-		return PYMENU_HELP;
-	else if( !strcmp( str, "HelpWebsites" ) )
-		return PYMENU_HELPWEBSITES;
-	else if( !strcmp( str, "HelpSystem" ) )
-		return PYMENU_HELPSYSTEM;
-	else if( !strcmp( str, "Render" ) )
-		return PYMENU_RENDER;
-	else if( !strcmp( str, "System" ) )
-		return PYMENU_SYSTEM;
-	else if( !strcmp( str, "Object" ) )
-		return PYMENU_OBJECT;
-	else if( !strcmp( str, "Mesh" ) )
-		return PYMENU_MESH;
-	else if( !strncmp( str, "Theme", 5 ) )
-		return PYMENU_THEMES;
-	else if( !strcmp( str, "Add" ) )
-		return PYMENU_ADD;
-	else if( !strcmp( str, "Wizards" ) )
-		return PYMENU_WIZARDS;
-	else if( !strcmp( str, "Animation" ) )
-		return PYMENU_ANIMATION;
-	else if( !strcmp( str, "Materials" ) )
-		return PYMENU_MATERIALS;
-	else if( !strcmp( str, "UV" ) )
-		return PYMENU_UV;
-	else if( !strcmp( str, "Image" ) )
-		return PYMENU_IMAGE;
-	else if( !strcmp( str, "FaceSelect" ) )
-		return PYMENU_FACESELECT;
-	else if( !strcmp( str, "WeightPaint" ) )
-		return PYMENU_WEIGHTPAINT;
-	else if( !strcmp( str, "VertexPaint" ) )
-		return PYMENU_VERTEXPAINT;
-	else if( !strcmp( str, "UVCalculation" ) )
-		return PYMENU_UVCALCULATION;
-	else if( !strcmp( str, "Armature" ) )
-		return PYMENU_ARMATURE;
-	else if( !strcmp( str, "ScriptTemplate" ) )
-		return PYMENU_SCRIPTTEMPLATE;
-	else if( !strcmp( str, "MeshFaceKey" ) )
-		return PYMENU_MESHFACEKEY;
-	else if( !strcmp( str, "AddMesh" ) )
-		return PYMENU_ADDMESH;
-	/* "Misc" or an inexistent group name: use misc */
-	else
-		return PYMENU_MISC;
-}
-
-char *BPyMenu_group_itoa( short menugroup )
-{
-	switch ( menugroup ) {
-	case PYMENU_EXPORT:
-		return "Export";
-		break;
-	case PYMENU_IMPORT:
-		return "Import";
-		break;
-	case PYMENU_ADD:
-		return "Add";
-		break;
-	case PYMENU_HELP:
-		return "Help";
-		break;
-	case PYMENU_HELPWEBSITES:
-		return "HelpWebsites";
-		break;
-	case PYMENU_HELPSYSTEM:
-		return "HelpSystem";
-		break;
-	case PYMENU_RENDER:
-		return "Render";
-		break;
-	case PYMENU_SYSTEM:
-		return "System";
-		break;
-	case PYMENU_OBJECT:
-		return "Object";
-		break;
-	case PYMENU_MESH:
-		return "Mesh";
-		break;
-	case PYMENU_THEMES:
-		return "Themes";
-		break;
-	case PYMENU_WIZARDS:
-		return "Wizards";
-		break;
-	case PYMENU_ANIMATION:
-		return "Animation";
-		break;
-	case PYMENU_MATERIALS:
-		return "Materials";
-		break;
-	case PYMENU_UV:
-		return "UV";
-		break;
-	case PYMENU_IMAGE:
-		return "Image";
-		break;
-	case PYMENU_FACESELECT:
-		return "FaceSelect";
-		break;
-	case PYMENU_WEIGHTPAINT:
-		return "WeightPaint";
-		break;
-	case PYMENU_VERTEXPAINT:
-		return "VertexPaint";
-		break;
-	case PYMENU_UVCALCULATION:
-		return "UVCalculation";
-		break;
-	case PYMENU_ARMATURE:
-		return "Armature";
-		break;
-	case PYMENU_SCRIPTTEMPLATE:
-		return "ScriptTemplate";
-		break;
-	case PYMENU_MESHFACEKEY:
-		return "MeshFaceKey";
-		break;
-	case PYMENU_ADDMESH:
-		return "AddMesh";
-		break;
-	case PYMENU_MISC:
-		return "Misc";
-		break;
-	}
-	return NULL;
-}
-
-/* BPyMenu_CreatePupmenuStr:
- * build and return a meaninful string to be used by pupmenu().  The
- * string is made of a bpymenu name as title and its submenus as possible
- * choices for the user.
-*/
-char *BPyMenu_CreatePupmenuStr( BPyMenu * pym, short menugroup )
-{
-	BPySubMenu *pysm = pym->submenus;
-	char str[1024], str2[100];
-	int i = 0, rlen;
-
-	if( !pym || !pysm )
-		return NULL;
-
-	str[0] = '\0';
-
-	PyOS_snprintf( str2, sizeof( str2 ), "%s: %s%%t",
-		       BPyMenu_group_itoa( menugroup ), pym->name );
-	strcat( str, str2 );
-
-	while( pysm ) {
-		PyOS_snprintf( str2, sizeof( str2 ), "|%s%%x%d", pysm->name,
-			       i );
-		rlen = sizeof( str ) - strlen( str );
-		strncat( str, str2, rlen );
-		i++;
-		pysm = pysm->next;
-	}
-
-	return BLI_strdup( str );
-}
-
-static void bpymenu_RemoveAllSubEntries( BPySubMenu * smenu )
-{
-	BPySubMenu *tmp;
-
-	while( smenu ) {
-		tmp = smenu->next;
-		if( smenu->name )
-			MEM_freeN( smenu->name );
-		if( smenu->arg )
-			MEM_freeN( smenu->arg );
-		MEM_freeN( smenu );
-		smenu = tmp;
-	}
-	return;
-}
-
-void BPyMenu_RemoveAllEntries( void )
-{
-	BPyMenu *tmp, *pymenu;
-	int i;
-
-	for( i = 0; i < PYMENU_TOTAL; i++ ) {
-		pymenu = BPyMenuTable[i];
-		while( pymenu ) {
-			tmp = pymenu->next;
-			if( pymenu->name )
-				MEM_freeN( pymenu->name );
-			if( pymenu->filename )
-				MEM_freeN( pymenu->filename );
-			if( pymenu->tooltip )
-				MEM_freeN( pymenu->tooltip );
-			if( pymenu->submenus )
-				bpymenu_RemoveAllSubEntries( pymenu->
-							     submenus );
-			MEM_freeN( pymenu );
-			pymenu = tmp;
-		}
-		BPyMenuTable[i] = NULL;
-	}
-
-	Dirs_Number = 0;
-	Dir_Depth = 0;
-
-	return;
-}
-
-static BPyMenu *bpymenu_FindEntry( short group, char *name )
-{
-	BPyMenu *pymenu;
-
-	if( ( group < 0 ) || ( group >= PYMENU_TOTAL ) )
-		return NULL;
-
-	pymenu = BPyMenuTable[group];
-
-	while( pymenu ) {
-		if( !strcmp( pymenu->name, name ) )
-			return pymenu;
-		pymenu = pymenu->next;
-	}
-
-	return NULL;
-}
-
-/* BPyMenu_GetEntry:
- * given a group and a position, return the entry in that position from
- * that group.
-*/
-BPyMenu *BPyMenu_GetEntry( short group, short pos )
-{
-	BPyMenu *pym = NULL;
-
-	if( ( group < 0 ) || ( group >= PYMENU_TOTAL ) )
-		return NULL;
-
-	pym = BPyMenuTable[group];
-
-	while( pos-- ) {
-		if( pym )
-			pym = pym->next;
-		else
-			break;
-	}
-
-	return pym;		/* found entry or NULL */
-}
-
-static void bpymenu_set_tooltip( BPyMenu * pymenu, char *tip )
-{
-	if( !pymenu )
-		return;
-
-	if( pymenu->tooltip )
-		MEM_freeN( pymenu->tooltip );
-	pymenu->tooltip = BLI_strdup( tip );
-
-	return;
-}
-
-/* bpymenu_AddEntry:
- * try to find an existing pymenu entry with the given type and name;
- * if found, update it with new info, otherwise create a new one and fill it.
- */
-static BPyMenu *bpymenu_AddEntry( short group, short version, char *name,
-	char *fname, int is_userdir, char *tooltip )
-{
-	BPyMenu *menu, *next = NULL, **iter;
-	int nameclash = 0;
-
-	if( ( group < 0 ) || ( group >= PYMENU_TOTAL ) )
-		return NULL;
-	if( !name || !fname )
-		return NULL;
-
-	menu = bpymenu_FindEntry( group, name );	/* already exists? */
-
-	/* if a menu with this name already exists in the same group:
-	 * - if one script is in the default dir and the other in U.pythondir,
-	 *   accept and let the new one override the other.
-	 * - otherwise, report the error and return NULL. */
-	if( menu ) {
-		if( menu->dir < is_userdir ) {	/* new one is in U.pythondir */
-			nameclash = 1;
-			if( menu->name )
-				MEM_freeN( menu->name );
-			if( menu->filename )
-				MEM_freeN( menu->filename );
-			if( menu->tooltip )
-				MEM_freeN( menu->tooltip );
-			if( menu->submenus )
-				bpymenu_RemoveAllSubEntries( menu->submenus );
-			next = menu->next;
-		} else {	/* they are in the same dir */
-			if (DEBUG) {
-				fprintf(stderr, "\n\
-Warning: script %s's menu name is already in use.\n\
-Edit the script and change its \n\
-Name: '%s'\n\
-field, please.\n\
-Note: if you really want to have two scripts for the same menu with\n\
-the same name, keep one in the default dir and the other in\n\
-the user defined dir (only the later will be registered).\n", fname, name);
-			}
-			return NULL;
-		}
-	} else
-		menu = MEM_mallocN( sizeof( BPyMenu ), "pymenu" );
-
-	if( !menu )
-		return NULL;
-
-	menu->name = BLI_strdup( name );
-	menu->version = version;
-	menu->filename = BLI_strdup( fname );
-	menu->tooltip = NULL;
-	if( tooltip )
-		menu->tooltip = BLI_strdup( tooltip );
-	menu->dir = is_userdir;
-	menu->submenus = NULL;
-	menu->next = next;	/* non-NULL if menu already existed */
-
-	if( nameclash )
-		return menu;	/* no need to place it, it's already at the list */
-	else {	/* insert the new entry in its correct position at the table */
-		BPyMenu *prev = NULL;
-		char *s = NULL;
-

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list