Revision: 28972
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28972
Author: campbellbarton
Date: 2010-05-25 08:53:18 +0200 (Tue, 25 May 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28959:28971
Modified Paths:
--------------
branches/render25/config/linuxcross-config.py
branches/render25/config/win32-mingw-config.py
branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/BKE_utildefines.h
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/blender.c
branches/render25/source/blender/blenlib/BLI_args.h
branches/render25/source/blender/blenlib/intern/BLI_args.c
branches/render25/source/blender/blenloader/BLO_writefile.h
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/blenloader/intern/writefile.c
branches/render25/source/blender/editors/armature/poselib.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/imbuf/IMB_thumbs.h
branches/render25/source/blender/imbuf/intern/thumbs.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/creator/creator.c
branches/render25/source/nan_definitions.mk
Added Paths:
-----------
branches/render25/source/blender/imbuf/intern/thumbs_blend.c
Modified: branches/render25/config/linuxcross-config.py
===================================================================
--- branches/render25/config/linuxcross-config.py 2010-05-25 06:24:45 UTC
(rev 28971)
+++ branches/render25/config/linuxcross-config.py 2010-05-25 06:53:18 UTC
(rev 28972)
@@ -77,7 +77,7 @@
WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/gcc/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'libtiff'
+BF_TIFF_LIB = 'tiff'
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
WITH_BF_ZLIB = True
Modified: branches/render25/config/win32-mingw-config.py
===================================================================
--- branches/render25/config/win32-mingw-config.py 2010-05-25 06:24:45 UTC
(rev 28971)
+++ branches/render25/config/win32-mingw-config.py 2010-05-25 06:53:18 UTC
(rev 28972)
@@ -76,7 +76,7 @@
WITH_BF_TIFF = True
BF_TIFF = LIBDIR + '/gcc/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
-BF_TIFF_LIB = 'libtiff'
+BF_TIFF_LIB = 'tiff'
BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
WITH_BF_ZLIB = True
Modified: branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
2010-05-25 06:24:45 UTC (rev 28971)
+++ branches/render25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
2010-05-25 06:53:18 UTC (rev 28972)
@@ -494,10 +494,6 @@
>
</File>
<File
-
RelativePath="..\..\..\source\blender\imbuf\intern\dynlibtiff.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\imbuf\intern\filetype.c"
>
</File>
@@ -748,10 +744,6 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
-
RelativePath="..\..\..\source\blender\imbuf\intern\dynlibtiff.h"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\imbuf\intern\IMB_allocimbuf.h"
>
</File>
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-05-25
06:24:45 UTC (rev 28971)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-05-25
06:53:18 UTC (rev 28972)
@@ -675,6 +675,7 @@
layout.menu("VIEW3D_MT_object_track")
layout.menu("VIEW3D_MT_object_group")
layout.menu("VIEW3D_MT_object_constraints")
+ layout.menu("VIEW3D_MT_object_game_properties")
layout.separator()
@@ -843,6 +844,17 @@
layout.operator_enums("object.make_links_data", "type") # inline
+class VIEW3D_MT_object_game_properties(bpy.types.Menu):
+ bl_label = "Game Properties"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("object.game_property_copy",
text="Replace").operation="REPLACE"
+ layout.operator("object.game_property_copy",
text="Merge").operation="MERGE"
+ # layout.operator("object.game_property_copy").operation="CLEAR"
doesn't really belong as part of copy...
+ layout.operator_menu_enum("object.game_property_copy", "property",
text="Copy...")
+
# ********** Vertex paint menu **********
@@ -2208,6 +2220,7 @@
VIEW3D_MT_object_track,
VIEW3D_MT_object_group,
VIEW3D_MT_object_constraints,
+ VIEW3D_MT_object_game_properties,
VIEW3D_MT_object_showhide,
VIEW3D_MT_make_single_user,
VIEW3D_MT_make_links,
Modified: branches/render25/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_utildefines.h
2010-05-25 06:24:45 UTC (rev 28971)
+++ branches/render25/source/blender/blenkernel/BKE_utildefines.h
2010-05-25 06:53:18 UTC (rev 28972)
@@ -38,6 +38,9 @@
#define TRUE 1
#endif
+/* Macro to convert a value to string in the preprocessor */
+#define QUOTE(x) #x
+
/* these values need to be hardcoded in structs, dna does not recognize
defines */
/* also defined in DNA_space_types.h */
#ifndef FILE_MAXDIR
@@ -163,7 +166,7 @@
#define IMAG MAKE_ID('I','M','A','G')
#define DNA1 MAKE_ID('D','N','A','1')
-#define TEST MAKE_ID('T','E','S','T')
+#define TEST MAKE_ID('T','E','S','T') /* used as preview between 'REND' and
'GLOB' */
#define REND MAKE_ID('R','E','N','D')
#define USER MAKE_ID('U','S','E','R')
Modified: branches/render25/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/anim.c 2010-05-25
06:24:45 UTC (rev 28971)
+++ branches/render25/source/blender/blenkernel/intern/anim.c 2010-05-25
06:53:18 UTC (rev 28972)
@@ -63,6 +63,7 @@
#include "BKE_particle.h"
#include "BKE_scene.h"
#include "BKE_utildefines.h"
+#include "BKE_depsgraph.h"
// XXX bad level call...
Modified: branches/render25/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/blender.c
2010-05-25 06:24:45 UTC (rev 28971)
+++ branches/render25/source/blender/blenkernel/intern/blender.c
2010-05-25 06:53:18 UTC (rev 28972)
@@ -534,7 +534,7 @@
sprintf(numstr, "%d.blend", counter);
BLI_make_file_string("/", tstr, btempdir, numstr);
- success= BLO_write_file(CTX_data_main(C), tstr, G.fileflags,
NULL);
+ success= BLO_write_file(CTX_data_main(C), tstr, G.fileflags,
NULL, NULL);
strcpy(curundo->str, tstr);
}
Modified: branches/render25/source/blender/blenlib/BLI_args.h
===================================================================
--- branches/render25/source/blender/blenlib/BLI_args.h 2010-05-25 06:24:45 UTC
(rev 28971)
+++ branches/render25/source/blender/blenlib/BLI_args.h 2010-05-25 06:53:18 UTC
(rev 28972)
@@ -41,14 +41,18 @@
struct bArgs *BLI_argsInit(int argc, char **argv);
void BLI_argsFree(struct bArgs *ba);
-/* pass starts at 1, -1 means valid all the time */
-void BLI_argsAdd(struct bArgs *ba, char *arg, int pass, BA_ArgCallback cb,
void *data);
-void BLI_argsAddPair(struct bArgs *ba, char *arg_short, char *arg_long, int
pass, BA_ArgCallback cb, void *data);
+/* pass starts at 1, -1 means valid all the time
+ * short_arg or long_arg can be null to specify no short or long versions
+ * */
+void BLI_argsAdd(struct bArgs *ba, int pass, char *short_arg, char *long_arg,
char *doc, BA_ArgCallback cb, void *data);
+/* short_case and long_case specify if those arguments are case specific */
+void BLI_argsAddCase(struct bArgs *ba, int pass, char *short_arg, int
short_case, char *long_arg, int long_case, char *doc, BA_ArgCallback cb, void
*data);
-void BLI_argsAddCase(struct bArgs *ba, char *arg, int pass, BA_ArgCallback cb,
void *data); /* not case specific */
-
void BLI_argsParse(struct bArgs *ba, int pass, BA_ArgCallback default_cb, void
*data);
+void BLI_argsPrintArgDoc(struct bArgs *ba, char *arg);
+void BLI_argsPrintOtherDoc(struct bArgs *ba);
+
void BLI_argsPrint(struct bArgs *ba);
char **BLI_argsArgv(struct bArgs *ba);
Modified: branches/render25/source/blender/blenlib/intern/BLI_args.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/BLI_args.c 2010-05-25
06:24:45 UTC (rev 28971)
+++ branches/render25/source/blender/blenlib/intern/BLI_args.c 2010-05-25
06:53:18 UTC (rev 28972)
@@ -33,10 +33,22 @@
#include "MEM_guardedalloc.h"
+#include "BLI_listbase.h"
#include "BLI_string.h"
#include "BLI_args.h"
#include "BLI_ghash.h"
+char NO_DOCS[] = "NO DOCUMENTATION SPECIFIED";
+
+struct bArgDoc;
+typedef struct bArgDoc {
+ struct bArgDoc *next, *prev;
+ char *short_arg;
+ char *long_arg;
+ char *documentation;
+ int done;
+} bArgDoc;
+
typedef struct bAKey {
char *arg;
uintptr_t pass; /* cast easier */
@@ -47,9 +59,11 @@
bAKey *key;
BA_ArgCallback func;
void *data;
+ bArgDoc *doc;
} bArgument;
struct bArgs {
+ ListBase docs;
GHash *items;
int argc;
char **argv;
@@ -70,7 +84,7 @@
static unsigned int keyhash(void *ptr)
{
bAKey *k = ptr;
- return case_strhash(k->arg) ^ BLI_ghashutil_inthash((void*)k->pass);
+ return case_strhash(k->arg); // ^ BLI_ghashutil_inthash((void*)k->pass);
}
static int keycmp(void *a, void *b)
@@ -103,6 +117,7 @@
bArgs *ba = MEM_callocN(sizeof(bArgs), "bArgs");
ba->passes = MEM_callocN(sizeof(int) * argc, "bArgs passes");
ba->items = BLI_ghash_new(keyhash, keycmp, "bArgs passes gh");
+ ba->docs.first = ba->docs.last = NULL;
ba->argc = argc;
ba->argv = argv;
@@ -118,6 +133,7 @@
{
BLI_ghash_free(ba->items, freeItem, freeItem);
MEM_freeN(ba->passes);
+ BLI_freelistN(&ba->docs);
MEM_freeN(ba);
}
@@ -134,8 +150,26 @@
return ba->argv;
}
-static void internalAdd(struct bArgs *ba, char *arg, int pass, int case_str,
BA_ArgCallback cb, void *data)
+static bArgDoc *internalDocs(struct bArgs *ba, char *short_arg, char
*long_arg, char *doc)
{
+ bArgDoc *d;
+
+ d = MEM_callocN(sizeof(bArgDoc), "bArgDoc");
+
+ if (doc == NULL)
+ doc = NO_DOCS;
+
+ d->short_arg = short_arg;
+ d->long_arg = long_arg;
+ d->documentation = doc;
+
+ BLI_addtail(&ba->docs, d);
+
+ return d;
+}
+
+static void internalAdd(struct bArgs *ba, char *arg, int pass, int case_str,
BA_ArgCallback cb, void *data, bArgDoc *d)
+{
bArgument *a;
bAKey *key;
@@ -157,36 +191,73 @@
a->key = key;
a->func = cb;
a->data = data;
+ a->doc = d;
BLI_ghash_insert(ba->items, key, a);
}
-void BLI_argsAdd(struct bArgs *ba, char *arg, int pass, BA_ArgCallback cb,
void *data)
+void BLI_argsAddCase(struct bArgs *ba, int pass, char *short_arg, int
short_case, char *long_arg, int long_case, char *doc, BA_ArgCallback cb, void
*data)
{
- internalAdd(ba, arg, pass, 0, cb, data);
+ bArgDoc *d = internalDocs(ba, short_arg, long_arg, doc);
+
+ if (short_arg)
+ internalAdd(ba, short_arg, pass, short_case, cb, data, d);
+
+ if (long_arg)
+ internalAdd(ba, long_arg, pass, long_case, cb, data, d);
+
+
}
-void BLI_argsAddPair(struct bArgs *ba, char *arg_short, char *arg_long, int
pass, BA_ArgCallback cb, void *data)
+void BLI_argsAdd(struct bArgs *ba, int pass, char *short_arg, char *long_arg,
char *doc, BA_ArgCallback cb, void *data)
{
- internalAdd(ba, arg_short, pass, 0, cb, data);
- internalAdd(ba, arg_long, pass, 0, cb, data);
+ BLI_argsAddCase(ba, pass, short_arg, 0, long_arg, 0, doc, cb, data);
}
-void BLI_argsAddCase(struct bArgs *ba, char *arg, int pass, BA_ArgCallback cb,
void *data)
+static void internalDocPrint(bArgDoc *d)
{
- internalAdd(ba, arg, pass, 1, cb, data);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
