Revision: 28523
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28523
Author: blendix
Date: 2010-04-30 15:00:03 +0200 (Fri, 30 Apr 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28505:28522
Modified Paths:
--------------
branches/render25/intern/guardedalloc/MEM_guardedalloc.h
branches/render25/intern/guardedalloc/intern/mallocn.c
branches/render25/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/render25/release/scripts/modules/graphviz_export.py
branches/render25/release/scripts/op/uvcalc_smart_project.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/intern/library.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenkernel/intern/texture.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/include/ED_logic.h
branches/render25/source/blender/editors/include/UI_resources.h
branches/render25/source/blender/editors/interface/resources.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/physics/physics_intern.h
branches/render25/source/blender/editors/physics/physics_ops.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/editors/space_logic/logic_ops.c
branches/render25/source/blender/editors/space_nla/nla_draw.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/view3d_select.c
branches/render25/source/blender/makesdna/DNA_curve_types.h
branches/render25/source/blender/makesdna/DNA_userdef_types.h
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/intern/rna_userdef.c
Property Changed:
----------------
branches/render25/source/blender/editors/include/ED_logic.h
branches/render25/source/blender/editors/space_logic/logic_ops.c
Modified: branches/render25/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/render25/intern/guardedalloc/MEM_guardedalloc.h 2010-04-30
07:22:07 UTC (rev 28522)
+++ branches/render25/intern/guardedalloc/MEM_guardedalloc.h 2010-04-30
13:00:03 UTC (rev 28523)
@@ -66,7 +66,7 @@
/** Returns the lenght of the allocated memory segment pointed at
* by vmemh. If the pointer was not previously allocated by this
* module, the result is undefined.*/
- int MEM_allocN_len(void *vmemh);
+ size_t MEM_allocN_len(void *vmemh);
/**
* Release memory previously allocatred by this module.
@@ -89,23 +89,23 @@
* allocated block, the old one is freed. this is not as optimized
* as a system realloc but just makes a new allocation and copies
* over from existing memory. */
- void *MEM_reallocN(void *vmemh, unsigned int len);
+ void *MEM_reallocN(void *vmemh, size_t len);
/**
* Allocate a block of memory of size len, with tag name str. The
* memory is cleared. The name must be static, because only a
* pointer to it is stored ! */
- void *MEM_callocN(unsigned int len, const char * str);
+ void *MEM_callocN(size_t len, const char * str);
/** Allocate a block of memory of size len, with tag name str. The
* name must be a static, because only a pointer to it is stored
!
* */
- void *MEM_mallocN(unsigned int len, const char * str);
+ void *MEM_mallocN(size_t len, const char * str);
/** Same as callocN, clears memory and uses mmap (disk cached) if
supported.
Can be free'd with MEM_freeN as usual.
* */
- void *MEM_mapallocN(unsigned int len, const char * str);
+ void *MEM_mapallocN(size_t len, const char * str);
/** Print a list of the names and sizes of all allocated memory
* blocks. as a python dict for easy investigation */
Modified: branches/render25/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/render25/intern/guardedalloc/intern/mallocn.c 2010-04-30
07:22:07 UTC (rev 28522)
+++ branches/render25/intern/guardedalloc/intern/mallocn.c 2010-04-30
13:00:03 UTC (rev 28523)
@@ -36,13 +36,20 @@
#include <stdlib.h>
#include <string.h> /* memcpy */
#include <stdarg.h>
+#include <sys/types.h>
+/* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */
+#if defined(WIN64)
+#define SIZET_FORMAT "%I64u"
+#define SIZET_ARG(a) ((unsigned long long)(a))
+#else
+#define SIZET_FORMAT "%lu"
+#define SIZET_ARG(a) ((unsigned long)(a))
+#endif
/* mmap exception */
#if defined(WIN32)
-#include <sys/types.h>
#include "mmap_win.h"
#else
-#include <sys/types.h>
#include <sys/mman.h>
#endif
@@ -82,7 +89,7 @@
/* note: keep this struct aligned (e.g., irix/gcc) - Hos */
typedef struct MemHead {
int tag1;
- unsigned int len;
+ size_t len;
struct MemHead *next,*prev;
const char * name;
const char * nextname;
@@ -213,7 +220,7 @@
malloc_debug_memset= 1;
}
-int MEM_allocN_len(void *vmemh)
+size_t MEM_allocN_len(void *vmemh)
{
if (vmemh) {
MemHead *memh= vmemh;
@@ -245,7 +252,7 @@
return newp;
}
-void *MEM_reallocN(void *vmemh, unsigned int len)
+void *MEM_reallocN(void *vmemh, size_t len)
{
void *newp= NULL;
@@ -267,7 +274,7 @@
return newp;
}
-static void make_memhead_header(MemHead *memh, unsigned int len, const char
*str)
+static void make_memhead_header(MemHead *memh, size_t len, const char *str)
{
MemTail *memt;
@@ -288,7 +295,7 @@
mem_in_use += len;
}
-void *MEM_mallocN(unsigned int len, const char *str)
+void *MEM_mallocN(size_t len, const char *str)
{
MemHead *memh;
@@ -312,11 +319,11 @@
return (++memh);
}
mem_unlock_thread();
- print_error("Malloc returns nill: len=%d in %s, total %u\n",len, str,
mem_in_use);
+ print_error("Malloc returns null: len=" SIZET_FORMAT " in %s, total
%u\n", SIZET_ARG(len), str, mem_in_use);
return NULL;
}
-void *MEM_callocN(unsigned int len, const char *str)
+void *MEM_callocN(size_t len, const char *str)
{
MemHead *memh;
@@ -337,12 +344,12 @@
return (++memh);
}
mem_unlock_thread();
- print_error("Calloc returns nill: len=%d in %s, total %u\n",len, str,
mem_in_use);
+ print_error("Calloc returns null: len=" SIZET_FORMAT " in %s, total
%u\n", SIZET_ARG(len), str, mem_in_use);
return 0;
}
/* note; mmap returns zero'd memory */
-void *MEM_mapallocN(unsigned int len, const char *str)
+void *MEM_mapallocN(size_t len, const char *str)
{
MemHead *memh;
@@ -380,7 +387,7 @@
}
else {
mem_unlock_thread();
- print_error("Mapalloc returns nill, fallback to regular malloc:
len=%d in %s, total %u\n",len, str, mmap_in_use);
+ print_error("Mapalloc returns null, fallback to regular malloc:
len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mmap_in_use);
return MEM_callocN(len, str);
}
}
@@ -492,12 +499,12 @@
}
while(membl) {
if (pydict) {
- fprintf(stderr, "{'len':%i, 'name':'''%s''',
'pointer':'%p'},\\\n", membl->len, membl->name, membl+1);
+ fprintf(stderr, "{'len':" SIZET_FORMAT ",
'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name,
membl+1);
} else {
#ifdef DEBUG_MEMCOUNTER
- print_error("%s len: %d %p, count:
%d\n",membl->name,membl->len, membl+1, membl->_count);
+ print_error("%s len: " SIZET_FORMAT " %p, count: %d\n",
membl->name, SIZET_ARG(membl->len), membl+1, membl->_count);
#else
- print_error("%s len: %d %p\n",membl->name,membl->len,
membl+1);
+ print_error("%s len: " SIZET_FORMAT " %p\n",
membl->name, SIZET_ARG(membl->len), membl+1);
#endif
}
if(membl->next)
Modified: branches/render25/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/editors/ED_editors.vcproj
2010-04-30 07:22:07 UTC (rev 28522)
+++ branches/render25/projectfiles_vc9/blender/editors/ED_editors.vcproj
2010-04-30 13:00:03 UTC (rev 28523)
@@ -235,6 +235,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\include\ED_logic.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_markers.h"
>
</File>
@@ -1476,6 +1480,10 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\space_logic\logic_ops.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_logic\logic_window.c"
>
</File>
Modified: branches/render25/release/scripts/modules/graphviz_export.py
===================================================================
--- branches/render25/release/scripts/modules/graphviz_export.py
2010-04-30 07:22:07 UTC (rev 28522)
+++ branches/render25/release/scripts/modules/graphviz_export.py
2010-04-30 13:00:03 UTC (rev 28523)
@@ -157,17 +157,18 @@
pbone = rna_path_as_pbone(rna_path)
if pbone:
- for target in fcurve_driver.driver.targets:
- pbone_target = rna_path_as_pbone(target.data_path)
- rna_path_target = target.data_path
- if pbone_target:
- opts = ['dir=forward', "weight=1",
"arrowhead=normal", "arrowtail=none", "constraint=false", 'color="blue"',
"labelfontsize=4"] # ,
- display_source = rna_path.replace("pose.bones", "")
- display_target =
rna_path_target.replace("pose.bones", "")
- if XTRA_INFO:
- label = "%s\\n%s" % (display_source,
display_target)
- opts.append('label="%s"' % compat_str(label))
- fw('"%s" -> "%s" [%s] ;\n' % (pbone_target.name,
pbone.name, ','.join(opts)))
+ for var in fcurve_driver.driver.variables:
+ for target in var.targets:
+ pbone_target = rna_path_as_pbone(target.data_path)
+ rna_path_target = target.data_path
+ if pbone_target:
+ opts = ['dir=forward', "weight=1",
"arrowhead=normal", "arrowtail=none", "constraint=false", 'color="blue"',
"labelfontsize=4"] # ,
+ display_source =
rna_path.replace("pose.bones", "")
+ display_target =
rna_path_target.replace("pose.bones", "")
+ if XTRA_INFO:
+ label = "%s\\n%s" % (display_source,
display_target)
+ opts.append('label="%s"' %
compat_str(label))
+ fw('"%s" -> "%s" [%s] ;\n' %
(pbone_target.name, pbone.name, ','.join(opts)))
fw(footer)
fileobject.close()
Modified: branches/render25/release/scripts/op/uvcalc_smart_project.py
===================================================================
--- branches/render25/release/scripts/op/uvcalc_smart_project.py
2010-04-30 07:22:07 UTC (rev 28522)
+++ branches/render25/release/scripts/op/uvcalc_smart_project.py
2010-04-30 13:00:03 UTC (rev 28523)
@@ -963,7 +963,7 @@
newProjectMeshFaces.append(tempMeshFaces.pop(fIdx))
# Add the average of all these faces normals as a projectionVec
- averageVec = Vector(0.0, 0.0, 0.0)
+ averageVec = Vector((0.0, 0.0, 0.0))
if USER_AREA_WEIGHT:
for fprop in newProjectMeshFaces:
averageVec += (fprop.no * fprop.area)
Modified: branches/render25/release/scripts/ui/space_userpref.py
===================================================================
--- branches/render25/release/scripts/ui/space_userpref.py 2010-04-30
07:22:07 UTC (rev 28522)
+++ branches/render25/release/scripts/ui/space_userpref.py 2010-04-30
13:00:03 UTC (rev 28523)
@@ -614,6 +614,7 @@
col.prop(v3d, "handle_sel_vect")
col.prop(v3d, "handle_sel_align")
col.prop(v3d, "act_spline")
+ col.prop(v3d, "lastsel_point")
col = split.column()
col.prop(v3d, "vertex")
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-04-30
07:22:07 UTC (rev 28522)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
