[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48928] branches/soc-2011-tomato: svn merge ^/trunk/blender -r48911:48927
Campbell Barton
ideasman42 at gmail.com
Sat Jul 14 22:56:40 CEST 2012
Revision: 48928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48928
Author: campbellbarton
Date: 2012-07-14 20:56:40 +0000 (Sat, 14 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48911:48927
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48911
Modified Paths:
--------------
branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_mempool.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
branches/soc-2011-tomato/source/blender/editors/include/ED_numinput.h
branches/soc-2011-tomato/source/blender/editors/mask/mask_draw.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/util/numinput.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_mask_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object_api.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48911
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-48927
Modified: branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h 2012-07-14 20:56:40 UTC (rev 48928)
@@ -20,19 +20,19 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Brecht Van Lommel
+ * Campbell Barton
*
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file MEM_guardedalloc.h
- * \ingroup MEM
+/**
+ * \file MEM_guardedalloc.h
+ * \ingroup MEM
*
- * \author Copyright (C) 2001 NaN Technologies B.V.
- * \brief Read \ref MEMPage
- */
-
-/**
+ * \author Copyright (C) 2001 NaN Technologies B.V.
+ * \brief Read \ref MEMPage
+ *
* \page MEMPage Guarded memory(de)allocation
*
* \section aboutmem c-style guarded memory allocation
@@ -118,8 +118,9 @@
__attribute__((alloc_size(1)))
#endif
;
-
- /** Allocate a block of memory of size len, with tag name str. The
+
+ /**
+ * 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(size_t len, const char *str)
@@ -129,8 +130,9 @@
__attribute__((alloc_size(1)))
#endif
;
-
- /** Same as callocN, clears memory and uses mmap (disk cached) if supported.
+
+ /**
+ * Same as callocN, clears memory and uses mmap (disk cached) if supported.
* Can be free'd with MEM_freeN as usual.
* */
void *MEM_mapallocN(size_t len, const char *str)
@@ -171,7 +173,8 @@
/** Attempt to enforce OSX (or other OS's) to have malloc and stack nonzero */
void MEM_set_memory_debug(void);
- /** Memory usage stats
+ /**
+ * Memory usage stats
* - MEM_get_memory_in_use is all memory
* - MEM_get_mapped_memory_in_use is a subset of all memory */
uintptr_t MEM_get_memory_in_use(void);
Modified: branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c 2012-07-14 20:56:40 UTC (rev 48928)
@@ -20,7 +20,8 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Brecht Van Lommel
+ * Campbell Barton
*
* ***** END GPL LICENSE BLOCK *****
*/
@@ -904,6 +905,4 @@
return "MEM_name_ptr(NULL)";
}
}
-#endif
-
-/* eof */
+#endif /* NDEBUG */
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py 2012-07-14 20:56:40 UTC (rev 48928)
@@ -734,7 +734,9 @@
col = layout.column()
col.prop(spline, "weight_interpolation")
- col.prop(spline, "use_cyclic")
+ rowsub = col.row()
+ rowsub.prop(spline, "use_cyclic")
+ rowsub.prop(spline, "use_fill")
class CLIP_PT_active_mask_point(Panel):
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_cdderivedmesh.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_cdderivedmesh.h 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_cdderivedmesh.h 2012-07-14 20:56:40 UTC (rev 48928)
@@ -66,7 +66,7 @@
/* creates a CDDerivedMesh from the given curve object and specified dispbase */
/* useful for OrcoDM creation for curves with constructive modifiers */
-DerivedMesh *CDDM_from_curve_customDB(struct Object *ob, struct ListBase *dispbase);
+DerivedMesh *CDDM_from_curve_displist(struct Object *ob, struct ListBase *dispbase);
/* Copies the given DerivedMesh with verts, faces & edges stored as
* custom element data.
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h 2012-07-14 20:56:40 UTC (rev 48928)
@@ -206,7 +206,7 @@
#define MASKPOINT_DESEL_HANDLE(p) { (p)->bezt.f1 &= ~SELECT; (p)->bezt.f3 &= ~SELECT; } (void)0
/* disable to test alternate rasterizer */
-#define USE_RASKTER
+/* #define USE_RASKTER */
/* mask_rasterize.c */
#ifndef USE_RASKTER
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h 2012-07-14 20:56:40 UTC (rev 48928)
@@ -141,10 +141,11 @@
int BKE_mesh_nurbs_to_mdata(struct Object *ob, struct MVert **allvert, int *totvert,
struct MEdge **alledge, int *totedge, struct MLoop **allloop, struct MPoly **allpoly,
int *totloop, int *totpoly);
-int BKE_mesh_nurbs_to_mdata_customdb(struct Object *ob, struct ListBase *dispbase, struct MVert **allvert, int *_totvert,
+int BKE_mesh_nurbs_displist_to_mdata(struct Object *ob, struct ListBase *dispbase, struct MVert **allvert, int *_totvert,
struct MEdge **alledge, int *_totedge, struct MLoop **allloop, struct MPoly **allpoly,
int *_totloop, int *_totpoly);
void BKE_mesh_from_nurbs(struct Object *ob);
+void BKE_mesh_from_nurbs_displist(struct Object *ob, struct ListBase *dispbase);
void BKE_mesh_from_curve(struct Scene *scene, struct Object *ob);
void free_dverts(struct MDeformVert *dvert, int totvert);
void copy_dverts(struct MDeformVert *dst, struct MDeformVert *src, int totvert); /* __NLA */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-07-14 20:56:40 UTC (rev 48928)
@@ -1709,10 +1709,10 @@
DerivedMesh *CDDM_from_curve(Object *ob)
{
- return CDDM_from_curve_customDB(ob, &ob->disp);
+ return CDDM_from_curve_displist(ob, &ob->disp);
}
-DerivedMesh *CDDM_from_curve_customDB(Object *ob, ListBase *dispbase)
+DerivedMesh *CDDM_from_curve_displist(Object *ob, ListBase *dispbase)
{
DerivedMesh *dm;
CDDerivedMesh *cddm;
@@ -1722,7 +1722,7 @@
MPoly *allpoly;
int totvert, totedge, totloop, totpoly;
- if (BKE_mesh_nurbs_to_mdata_customdb(ob, dispbase, &allvert, &totvert, &alledge,
+ if (BKE_mesh_nurbs_displist_to_mdata(ob, dispbase, &allvert, &totvert, &alledge,
&totedge, &allloop, &allpoly, &totloop, &totpoly) != 0)
{
/* Error initializing mdata. This often happens when curve is empty */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c 2012-07-14 20:56:40 UTC (rev 48928)
@@ -948,7 +948,7 @@
curve_to_filledpoly(cu, nurb, dispbase);
}
- dm = CDDM_from_curve_customDB(ob, dispbase);
+ dm = CDDM_from_curve_displist(ob, dispbase);
CDDM_calc_normals_mapping(dm);
}
@@ -1038,7 +1038,7 @@
/* OrcoDM should be created from underformed disp lists */
BKE_displist_make_curveTypes_forOrco(scene, ob, &disp);
- dm = CDDM_from_curve_customDB(ob, &disp);
+ dm = CDDM_from_curve_displist(ob, &disp);
BKE_displist_free(&disp);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c 2012-07-14 20:53:52 UTC (rev 48927)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c 2012-07-14 20:56:40 UTC (rev 48928)
@@ -46,28 +46,44 @@
#ifndef USE_RASKTER
+#define SPLINE_RESOL_CAP 32
+#define SPLINE_RESOL 32
+#define BUCKET_PIXELS_PER_CELL 8
+
+#define SF_EDGE_IS_BOUNDARY 0xff
+#define SF_KEYINDEX_TEMP_ID ((unsigned int) -1)
+
+#define TRI_TERMINATOR_ID ((unsigned int) -1)
+#define TRI_VERT ((unsigned int) -1)
+
+
+/* --------------------------------------------------------------------- */
+/* local structs for mask rasterizeing */
+/* --------------------------------------------------------------------- */
+
/**
* A single #MaskRasterHandle contains multile #MaskRasterLayer's,
* each #MaskRasterLayer does its own lookup which contributes to
- * the final pixel with its own blending mode and the final pixel is blended between these.
+ * the final pixel with its own blending mode and the final pixel
+ * is blended between these.
*/
/* internal use only */
typedef struct MaskRasterLayer {
/* geometry */
- unsigned int tri_tot;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list