[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50489] trunk/blender/source/blender: code cleanup: use single define for undo string size, was 64 mostly, but 512 in the UI.
Campbell Barton
ideasman42 at gmail.com
Mon Sep 10 03:56:01 CEST 2012
Revision: 50489
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50489
Author: campbellbarton
Date: 2012-09-10 01:55:58 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
code cleanup: use single define for undo string size, was 64 mostly, but 512 in the UI.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/gpencil/gpencil_undo.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/sculpt_paint/paint_undo.c
trunk/blender/source/blender/editors/util/editmode_undo.c
trunk/blender/source/blender/editors/util/undo.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-09-10 01:55:58 UTC (rev 50489)
@@ -83,6 +83,8 @@
void set_blender_test_break_cb(void (*func)(void) );
int blender_test_break(void);
+#define BKE_UNDO_STR_MAX 64
+
/* global undo */
extern void BKE_write_undo(struct bContext *C, const char *name);
extern void BKE_undo_step(struct bContext *C, int step);
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2012-09-10 01:55:58 UTC (rev 50489)
@@ -463,11 +463,10 @@
#define UNDO_DISK 0
-#define MAXUNDONAME 64
typedef struct UndoElem {
struct UndoElem *next, *prev;
char str[FILE_MAX];
- char name[MAXUNDONAME];
+ char name[BKE_UNDO_STR_MAX];
MemFile memfile;
uintptr_t undosize;
} UndoElem;
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-09-10 01:55:58 UTC (rev 50489)
@@ -27,7 +27,6 @@
* \ingroup edgpencil
*/
-
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_undo.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_undo.c 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_undo.c 2012-09-10 01:55:58 UTC (rev 50489)
@@ -25,6 +25,10 @@
* ***** END GPL LICENSE BLOCK *****
*/
+/** \file blender/editors/gpencil/gpencil_undo.c
+ * \ingroup edgpencil
+ */
+
#include <stdlib.h>
#include <string.h>
@@ -34,6 +38,7 @@
#include "DNA_listBase.h"
#include "DNA_windowmanager_types.h"
+#include "BKE_blender.h"
#include "BKE_context.h"
#include "BKE_gpencil.h"
@@ -46,12 +51,10 @@
#include "gpencil_intern.h"
-#define MAXUNDONAME 64
-
typedef struct bGPundonode {
struct bGPundonode *next, *prev;
- char name[MAXUNDONAME];
+ char name[BKE_UNDO_STR_MAX];
struct bGPdata *gpd;
} bGPundonode;
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-10 01:55:58 UTC (rev 50489)
@@ -197,7 +197,7 @@
bContextStore *context;
- char undostr[512];
+ char undostr[BKE_UNDO_STR_MAX];
int autokey;
} uiAfterFunc;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_undo.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_undo.c 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_undo.c 2012-09-10 01:55:58 UTC (rev 50489)
@@ -23,7 +23,6 @@
* \brief Undo system for painting and sculpting.
*/
-
#include <stdlib.h>
#include <string.h>
@@ -35,7 +34,7 @@
#include "DNA_userdef_types.h"
-
+#include "BKE_blender.h"
#include "BKE_context.h"
#include "BKE_global.h"
@@ -43,11 +42,9 @@
#include "paint_intern.h"
-#define MAXUNDONAME 64
-
typedef struct UndoElem {
struct UndoElem *next, *prev;
- char name[MAXUNDONAME];
+ char name[BKE_UNDO_STR_MAX];
uintptr_t undosize;
ListBase elems;
@@ -272,4 +269,3 @@
undo_stack_free(&ImageUndoStack);
undo_stack_free(&MeshUndoStack);
}
-
Modified: trunk/blender/source/blender/editors/util/editmode_undo.c
===================================================================
--- trunk/blender/source/blender/editors/util/editmode_undo.c 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/editors/util/editmode_undo.c 2012-09-10 01:55:58 UTC (rev 50489)
@@ -29,8 +29,6 @@
* \ingroup edutil
*/
-
-
#include <stdlib.h>
#include <string.h>
#include <math.h>
@@ -44,7 +42,7 @@
#include "BLI_dynstr.h"
#include "BLI_utildefines.h"
-
+#include "BKE_blender.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h"
#include "BKE_global.h"
@@ -82,8 +80,6 @@
static void error(const char *UNUSED(arg)) {}
/* ****** XXX ***** */
-
-#define MAXUNDONAME 64
typedef struct UndoElem {
struct UndoElem *next, *prev;
ID id; // copy of editmode object ID
@@ -91,7 +87,7 @@
int type; // type of edited object
void *undodata;
uintptr_t undosize;
- char name[MAXUNDONAME];
+ char name[BKE_UNDO_STR_MAX];
void * (*getdata)(bContext * C);
void (*freedata)(void *);
void (*to_editmode)(void *, void *, void *);
Modified: trunk/blender/source/blender/editors/util/undo.c
===================================================================
--- trunk/blender/source/blender/editors/util/undo.c 2012-09-10 01:34:42 UTC (rev 50488)
+++ trunk/blender/source/blender/editors/util/undo.c 2012-09-10 01:55:58 UTC (rev 50489)
@@ -74,8 +74,6 @@
#include "util_intern.h"
-#define MAXUNDONAME 64 /* XXX, make common define */
-
/* ***************** generic undo system ********************* */
void ED_undo_push(bContext *C, const char *str)
@@ -283,7 +281,7 @@
static int ed_undo_push_exec(bContext *C, wmOperator *op)
{
- char str[MAXUNDONAME];
+ char str[BKE_UNDO_STR_MAX];
RNA_string_get(op->ptr, "message", str);
ED_undo_push(C, str);
return OPERATOR_FINISHED;
@@ -321,7 +319,7 @@
ot->flag = OPTYPE_INTERNAL;
- RNA_def_string(ot->srna, "message", "Add an undo step *function may be moved*", MAXUNDONAME, "Undo Message", "");
+ RNA_def_string(ot->srna, "message", "Add an undo step *function may be moved*", BKE_UNDO_STR_MAX, "Undo Message", "");
}
void ED_OT_redo(wmOperatorType *ot)
More information about the Bf-blender-cvs
mailing list