[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36560] branches/bmesh/blender/source/ blender: moved more minor changes across from trunk, fixed some incorrect merges and removed unused includes.
Campbell Barton
ideasman42 at gmail.com
Mon May 9 08:53:40 CEST 2011
Revision: 36560
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36560
Author: campbellbarton
Date: 2011-05-09 06:53:39 +0000 (Mon, 09 May 2011)
Log Message:
-----------
moved more minor changes across from trunk, fixed some incorrect merges and removed unused includes.
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c
branches/bmesh/blender/source/blender/blenkernel/intern/font.c
branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c
branches/bmesh/blender/source/blender/blenkernel/intern/key.c
branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/sca.c
branches/bmesh/blender/source/blender/blenkernel/intern/seqcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
branches/bmesh/blender/source/blender/blenlib/intern/rct.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -45,7 +45,6 @@
#include "DNA_object_types.h"
#include "BLI_math.h"
-#include "BLI_cellalloc.h"
#include "BLI_utildefines.h"
#include "BKE_bmesh.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/anim.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/anim.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -52,8 +52,6 @@
#include "DNA_key_types.h"
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_view3d_types.h"
#include "DNA_vfont_types.h"
#include "BKE_animsys.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -41,7 +41,6 @@
#include "BLI_math.h"
#include "BLI_blenlib.h"
-#include "BLI_cellalloc.h"
#include "BLI_utildefines.h"
#include "DNA_anim_types.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/blender.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/blender.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -456,8 +456,6 @@
BLI_strncpy(mainstr, G.main->name, sizeof(mainstr)); /* temporal store */
- strcpy(mainstr, G.main->name); /* temporal store */
-
fileflags= G.fileflags;
G.fileflags |= G_FILE_NO_UI;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -44,7 +44,6 @@
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_editVert.h"
-#include "BLI_cellalloc.h"
#include "BLI_utildefines.h"
#include "DNA_armature_types.h"
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/fluidsim.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -67,6 +67,7 @@
/* ************************* fluidsim bobj file handling **************************** */
+
//-------------------------------------------------------------------------------
// file handling
//-------------------------------------------------------------------------------
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/font.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/font.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -258,7 +258,7 @@
void free_ttfont(void)
{
struct TmpFont *tf;
-
+
for(tf= ttfdata.first; tf; tf= tf->next) {
if(tf->pf) freePackedFile(tf->pf); /* NULL when the font file can't be found on disk */
tf->pf= NULL;
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c 2011-05-09 05:55:41 UTC (rev 36559)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c 2011-05-09 06:53:39 UTC (rev 36560)
@@ -1,140 +1,140 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL 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.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- * return info about ID types
- */
-
-/** \file blender/blenkernel/intern/idcode.c
- * \ingroup bke
- */
-
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "DNA_ID.h"
-
-#include "BKE_idcode.h"
-
-typedef struct {
- unsigned short code;
- const char *name, *plural;
-
- int flags;
-#define IDTYPE_FLAGS_ISLINKABLE (1<<0)
-} IDType;
-
-/* plural need to match rna_main.c's MainCollectionDef */
-static IDType idtypes[]= {
- { ID_AC, "Action", "actions", IDTYPE_FLAGS_ISLINKABLE},
- { ID_AR, "Armature", "armatures", IDTYPE_FLAGS_ISLINKABLE},
- { ID_BR, "Brush", "brushes", IDTYPE_FLAGS_ISLINKABLE},
- { ID_CA, "Camera", "cameras", IDTYPE_FLAGS_ISLINKABLE},
- { ID_CU, "Curve", "curves", IDTYPE_FLAGS_ISLINKABLE},
- { ID_GD, "GPencil", "grease_pencil",IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */
- { ID_GR, "Group", "groups", IDTYPE_FLAGS_ISLINKABLE},
- { ID_ID, "ID", "ids", 0}, /* plural is fake */
- { ID_IM, "Image", "images", IDTYPE_FLAGS_ISLINKABLE},
- { ID_IP, "Ipo", "ipos", IDTYPE_FLAGS_ISLINKABLE}, /* deprecated */
- { ID_KE, "Key", "keys", 0},
- { ID_LA, "Lamp", "lamps", IDTYPE_FLAGS_ISLINKABLE},
- { ID_LI, "Library", "libraries", 0},
- { ID_LT, "Lattice", "lattices", IDTYPE_FLAGS_ISLINKABLE},
- { ID_MA, "Material", "materials", IDTYPE_FLAGS_ISLINKABLE},
- { ID_MB, "Metaball", "metaballs", IDTYPE_FLAGS_ISLINKABLE},
- { ID_ME, "Mesh", "meshes", IDTYPE_FLAGS_ISLINKABLE},
- { ID_NT, "NodeTree", "node_groups", IDTYPE_FLAGS_ISLINKABLE},
- { ID_OB, "Object", "objects", IDTYPE_FLAGS_ISLINKABLE},
- { ID_PA, "ParticleSettings", "particles", 0},
- { ID_SCE, "Scene", "scenes", IDTYPE_FLAGS_ISLINKABLE},
- { ID_SCR, "Screen", "screens", 0},
- { ID_SEQ, "Sequence", "sequences", 0}, /* not actually ID data */
- { ID_SO, "Sound", "sounds", IDTYPE_FLAGS_ISLINKABLE},
- { ID_TE, "Texture", "textures", IDTYPE_FLAGS_ISLINKABLE},
- { ID_TXT, "Text", "texts", IDTYPE_FLAGS_ISLINKABLE},
- { ID_VF, "VFont", "fonts", IDTYPE_FLAGS_ISLINKABLE},
- { ID_WO, "World", "worlds", IDTYPE_FLAGS_ISLINKABLE},
- { ID_WM, "WindowManager", "window_managers", 0},
-};
-static int nidtypes= sizeof(idtypes)/sizeof(idtypes[0]);
-
-static IDType *idtype_from_name(const char *str)
-{
- int i= nidtypes;
-
- while (i--)
- if (strcmp(str, idtypes[i].name)==0)
- return &idtypes[i];
-
- return NULL;
-}
-static IDType *idtype_from_code(int code)
-{
- int i= nidtypes;
-
- while (i--)
- if (code==idtypes[i].code)
- return &idtypes[i];
-
- return NULL;
-}
-
-int BKE_idcode_is_valid(int code)
-{
- return idtype_from_code(code)?1:0;
-}
-
-int BKE_idcode_is_linkable(int code) {
- IDType *idt= idtype_from_code(code);
- return idt?(idt->flags&IDTYPE_FLAGS_ISLINKABLE):0;
-}
-
-const char *BKE_idcode_to_name(int code)
-{
- IDType *idt= idtype_from_code(code);
-
- return idt?idt->name:NULL;
-}
-
-int BKE_idcode_from_name(const char *name)
-{
- IDType *idt= idtype_from_name(name);
-
- return idt?idt->code:0;
-}
-
-const char *BKE_idcode_to_name_plural(int code)
-{
- IDType *idt= idtype_from_code(code);
-
- return idt?idt->plural:NULL;
-}
-
-int BKE_idcode_iter_step(int *index)
-{
- return (*index < nidtypes) ? idtypes[(*index)++].code : 0;
-}
+/*
+ * $Id: idcode.c 35493 2011-03-12 14:38:00Z campbellbarton $
+ *
+ * ***** BEGIN GPL 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.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ * return info about ID types
+ */
+
+/** \file blender/blenkernel/intern/idcode.c
+ * \ingroup bke
+ */
+
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "DNA_ID.h"
+
+#include "BKE_idcode.h"
+
+typedef struct {
+ unsigned short code;
+ const char *name, *plural;
+
+ int flags;
+#define IDTYPE_FLAGS_ISLINKABLE (1<<0)
+} IDType;
+
+/* plural need to match rna_main.c's MainCollectionDef */
+static IDType idtypes[]= {
+ { ID_AC, "Action", "actions", IDTYPE_FLAGS_ISLINKABLE},
+ { ID_AR, "Armature", "armatures", IDTYPE_FLAGS_ISLINKABLE},
+ { ID_BR, "Brush", "brushes", IDTYPE_FLAGS_ISLINKABLE},
+ { ID_CA, "Camera", "cameras", IDTYPE_FLAGS_ISLINKABLE},
+ { ID_CU, "Curve", "curves", IDTYPE_FLAGS_ISLINKABLE},
+ { ID_GD, "GPencil", "grease_pencil",IDTYPE_FLAGS_ISLINKABLE}, /* rename gpencil */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list