[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58612] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Fri Jul 26 05:04:54 CEST 2013
Revision: 58612
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58612
Author: gdh
Date: 2013-07-26 03:04:52 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58590 to r58611.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58590
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58611
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_relations.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_armature.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/util.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-cycles_mblur/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-cycles_mblur/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_holes.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58589
+ /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58611
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-26 00:37:26 UTC (rev 58611)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-26 03:04:52 UTC (rev 58612)
@@ -1822,6 +1822,7 @@
layout.menu("VIEW3D_MT_edit_mesh_edges")
layout.menu("VIEW3D_MT_edit_mesh_faces")
layout.menu("VIEW3D_MT_edit_mesh_normals")
+ layout.menu("VIEW3D_MT_edit_mesh_clean")
layout.separator()
@@ -2084,6 +2085,15 @@
layout.operator("mesh.flip_normals")
+class VIEW3D_MT_edit_mesh_clean(Menu):
+ bl_label = "Clean"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("mesh.fill_holes")
+
+
class VIEW3D_MT_edit_mesh_delete(Menu):
bl_label = "Delete"
Modified: branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi.c 2013-07-26 00:37:26 UTC (rev 58611)
+++ branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi.c 2013-07-26 03:04:52 UTC (rev 58612)
@@ -811,12 +811,16 @@
movie->streams[i].sh.fcc = FCC("strh");
movie->streams[i].sh.size = 56;
movie->streams[i].sh.Type = avi_get_format_type(movie->streams[i].format);
- if (movie->streams[i].sh.Type == 0)
+ if (movie->streams[i].sh.Type == 0) {
+ va_end(ap);
return AVI_ERROR_FORMAT;
+ }
movie->streams[i].sh.Handler = avi_get_format_fcc(movie->streams[i].format);
- if (movie->streams[i].sh.Handler == 0)
+ if (movie->streams[i].sh.Handler == 0) {
+ va_end(ap);
return AVI_ERROR_FORMAT;
+ }
movie->streams[i].sh.Flags = 0;
movie->streams[i].sh.Priority = 0;
@@ -950,6 +954,8 @@
PUT_FCCN((header_pos2 - header_pos1 + 4L), movie->fp);
+ va_end(ap);
+
return AVI_ERROR_NONE;
}
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c 2013-07-26 00:37:26 UTC (rev 58611)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pointcache.c 2013-07-26 03:04:52 UTC (rev 58612)
@@ -268,8 +268,9 @@
PTCACHE_DATA_FROM(data, BPHYS_DATA_SIZE, &pa->size);
PTCACHE_DATA_FROM(data, BPHYS_DATA_TIMES, times);
- if (boid)
+ if (boid) {
PTCACHE_DATA_FROM(data, BPHYS_DATA_BOIDS, &boid->data);
+ }
/* return flag 1+1=2 for newly born particles to copy exact birth location to previously cached frame */
return 1 + (pa->state.time >= pa->time && pa->prev_state.time <= pa->time);
@@ -304,8 +305,9 @@
else if (cfra > pa->dietime)
pa->state.time = pa->dietime;
- if (data[BPHYS_DATA_SIZE])
+ if (data[BPHYS_DATA_SIZE]) {
PTCACHE_DATA_TO(data, BPHYS_DATA_SIZE, 0, &pa->size);
+ }
if (data[BPHYS_DATA_TIMES]) {
float times[3];
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt 2013-07-26 00:37:26 UTC (rev 58611)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt 2013-07-26 03:04:52 UTC (rev 58612)
@@ -51,6 +51,7 @@
operators/bmo_extrude.c
operators/bmo_fill_edgeloop.c
operators/bmo_fill_grid.c
+ operators/bmo_fill_holes.c
operators/bmo_hull.c
operators/bmo_inset.c
operators/bmo_join_triangles.c
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c 2013-07-26 00:37:26 UTC (rev 58611)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c 2013-07-26 03:04:52 UTC (rev 58612)
@@ -200,6 +200,8 @@
ev1 = edges[0]->v1;
ev2 = edges[0]->v2;
+ BLI_assert(ELEM(v1, ev1, ev2) && ELEM(v2, ev1, ev2));
+
if (v1 == ev2) {
/* Swapping here improves performance and consistency of face
* structure in the special case that the edges are already in
@@ -322,6 +324,7 @@
BMEdge **edge_arr = BLI_array_alloca(edge_arr, len);
unsigned int winding[2] = {0, 0};
int i, i_prev = len - 1;
+ BMVert *v_winding[2] = {vert_arr[i_prev], vert_arr[0]};
BLI_assert(len > 2);
@@ -344,6 +347,7 @@
/* we want to use the reverse winding to the existing order */
BM_edge_ordered_verts(edge_arr[i], &test_v2, &test_v1);
winding[(vert_arr[i_prev] == test_v2)]++;
+ BLI_assert(vert_arr[i_prev] == test_v2 || vert_arr[i_prev] == test_v1);
}
}
@@ -370,7 +374,11 @@
/* --- */
/* create the face */
- return BM_face_create_ngon(bm, vert_arr[winding[0]], vert_arr[winding[1]], edge_arr, len, create_flag);
+ return BM_face_create_ngon(
+ bm,
+ v_winding[winding[0]],
+ v_winding[winding[1]],
+ edge_arr, len, create_flag);
}
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c 2013-07-26 00:37:26 UTC (rev 58611)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c 2013-07-26 03:04:52 UTC (rev 58612)
@@ -518,6 +518,7 @@
{"use_cyclic", BMO_OP_SLOT_BOOL},
{"use_merge", BMO_OP_SLOT_BOOL},
{"merge_factor", BMO_OP_SLOT_FLT},
+ {"twist_offset", BMO_OP_SLOT_INT},
{{'\0'}},
},
/* slots_out */
@@ -552,7 +553,30 @@
BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH,
};
+
/*
+ * Fill Holes.
+ *
+ * Fill boundary edges with faces, copying surrounding customdata.
+ */
+static BMOpDefine bmo_holes_fill_def = {
+ "holes_fill",
+ /* slots_in */
+ {{"edges", BMO_OP_SLOT_ELEMENT_BUF, {BM_EDGE}}, /* input edges */
+ {"sides", BMO_OP_SLOT_INT}, /* number of face sides to fill */
+ {{'\0'}},
+ },
+ /* slots_out */
+ /* maps new faces to the group numbers they came from */
+ {{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* new faces */
+ {{'\0'}},
+ },
+ bmo_holes_fill_exec,
+ BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH,
+};
+
+
+/*
* Edge Loop Fill.
*
* Create faces defined by one or more non overlapping edge loops.
@@ -947,7 +971,9 @@
{"delimit", BMO_OP_SLOT_INT},
{{'\0'}},
},
- {{{'\0'}}}, /* no output */
+ /* slots_out */
+ {{"region.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}},
+ {{'\0'}}},
bmo_dissolve_limit_exec,
BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH,
};
@@ -1044,7 +1070,7 @@
{{'\0'}},
},
{{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */
- {{'\0'}}}, /* no output */
+ {{'\0'}}},
bmo_subdivide_edgering_exec,
BMO_OPTYPE_FLAG_UNTAN_MULTIRES | BMO_OPTYPE_FLAG_NORMALS_CALC | BMO_OPTYPE_FLAG_SELECT_FLUSH,
};
@@ -1224,7 +1250,6 @@
{"use_ccw", BMO_OP_SLOT_BOOL}, /* rotate counter-clockwise if true, otherwise clockwise */
{{'\0'}},
},
- /* slots_out */
{{{'\0'}}}, /* no output */
bmo_rotate_uvs_exec,
BMO_OPTYPE_FLAG_NOP,
@@ -1723,6 +1748,7 @@
&bmo_dissolve_limit_def,
&bmo_dissolve_verts_def,
&bmo_duplicate_def,
+ &bmo_holes_fill_def,
&bmo_edgeloop_fill_def,
&bmo_edgenet_fill_def,
&bmo_edgenet_prepare_def,
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h 2013-07-26 00:37:26 UTC (rev 58611)
+++ branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h 2013-07-26 03:04:52 UTC (rev 58612)
@@ -58,6 +58,7 @@
void bmo_dissolve_verts_exec(BMesh *bm, BMOperator *op);
void bmo_duplicate_exec(BMesh *bm, BMOperator *op);
void bmo_edgeloop_fill_exec(BMesh *bm, BMOperator *op);
+void bmo_holes_fill_exec(BMesh *bm, BMOperator *op);
void bmo_edgenet_fill_exec(BMesh *bm, BMOperator *op);
void bmo_edgenet_prepare_exec(BMesh *bm, BMOperator *op);
void bmo_extrude_discrete_faces_exec(BMesh *bm, BMOperator *op);
Modified: branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_beautify.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_beautify.c 2013-07-26 00:37:26 UTC (rev 58611)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list