[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58682] branches/soc-2013-dingto: Merged revision(s) 58585-58681 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Sun Jul 28 08:17:10 CEST 2013
Revision: 58682
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58682
Author: dingto
Date: 2013-07-28 06:17:10 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
Merged revision(s) 58585-58681 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/source/blender/avi/intern/avi.c
branches/soc-2013-dingto/source/blender/blenkernel/BKE_context.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/camera.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/context.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/deform.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/text.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_buffer.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_string.h
branches/soc-2013-dingto/source/blender/blenlib/intern/fileops.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-dingto/source/blender/blenlib/intern/string.c
branches/soc-2013-dingto/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2013-dingto/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-dingto/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-dingto/source/blender/editors/animation/anim_intern.h
branches/soc-2013-dingto/source/blender/editors/animation/keyframes_general.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_edit.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_relations.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_utils.c
branches/soc-2013-dingto/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-dingto/source/blender/editors/include/ED_armature.h
branches/soc-2013-dingto/source/blender/editors/include/UI_interface.h
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_intern.h
branches/soc-2013-dingto/source/blender/editors/interface/interface_regions.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-dingto/source/blender/editors/object/object_add.c
branches/soc-2013-dingto/source/blender/editors/screen/area.c
branches/soc-2013-dingto/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-dingto/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-dingto/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-dingto/source/blender/imbuf/intern/util.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-dingto/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2013-dingto/source/blender/render/intern/source/external_engine.c
branches/soc-2013-dingto/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-dingto/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
Added Paths:
-----------
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_fill_holes.c
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-dingto
___________________________________________________________________
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:57315-57365,57369-58448,58450,58452-58584
+ /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:57315-57365,57369-58448,58450,58452-58681
Modified: branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py 2013-07-28 06:17:10 UTC (rev 58682)
@@ -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-dingto/source/blender/avi/intern/avi.c
===================================================================
--- branches/soc-2013-dingto/source/blender/avi/intern/avi.c 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/avi/intern/avi.c 2013-07-28 06:17:10 UTC (rev 58682)
@@ -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-dingto/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_context.h 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_context.h 2013-07-28 06:17:10 UTC (rev 58682)
@@ -200,8 +200,8 @@
void CTX_data_type_set(struct bContextDataResult *result, short type);
short CTX_data_type_get(struct bContextDataResult *result);
-int CTX_data_equals(const char *member, const char *str);
-int CTX_data_dir(const char *member);
+bool CTX_data_equals(const char *member, const char *str);
+bool CTX_data_dir(const char *member);
#if 0
void CTX_data_pointer_set(bContextDataResult *result, void *data);
Modified: branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h 2013-07-28 06:17:10 UTC (rev 58682)
@@ -265,7 +265,7 @@
/* **********************************************************************
* seqeffects.c
*
- * Sequencer effect strip managment functions
+ * Sequencer effect strip management functions
* **********************************************************************
*/
Modified: branches/soc-2013-dingto/source/blender/blenkernel/intern/camera.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/intern/camera.c 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/blenkernel/intern/camera.c 2013-07-28 06:17:10 UTC (rev 58682)
@@ -408,26 +408,33 @@
}
else {
/* that way it's always visible - clipsta+0.1 */
- float fac;
- float half_sensor = 0.5f * ((camera->sensor_fit == CAMERA_SENSOR_FIT_VERT) ? (camera->sensor_y) : (camera->sensor_x));
+ float fac, scale_x, scale_y;
+ float half_sensor = 0.5f * ((camera->sensor_fit == CAMERA_SENSOR_FIT_VERT) ?
+ (camera->sensor_y) : (camera->sensor_x));
- *r_drawsize = drawsize / ((scale[0] + scale[1] + scale[2]) / 3.0f);
if (do_clip) {
/* fixed depth, variable size (avoids exceeding clipping range) */
- depth = -(camera->clipsta + 0.1f);
- fac = depth / (camera->lens / (-half_sensor) * scale[2]);
+ /* r_drawsize shouldn't be used in this case, set to dummy value */
+ *r_drawsize = 1.0f;
+ depth = -(camera->clipsta + 0.1f) * scale[2];
+ fac = depth / (camera->lens / (-half_sensor));
+ scale_x = 1.0f;
+ scale_y = 1.0f;
}
else {
/* fixed size, variable depth (stays a reasonable size in the 3D view) */
+ *r_drawsize = drawsize / ((scale[0] + scale[1] + scale[2]) / 3.0f);
depth = *r_drawsize * camera->lens / (-half_sensor) * scale[2];
fac = *r_drawsize;
+ scale_x = scale[0];
+ scale_y = scale[1];
}
- facx = fac * r_asp[0] * scale[0];
- facy = fac * r_asp[1] * scale[1];
- r_shift[0] = camera->shiftx * fac * 2 * scale[0];
- r_shift[1] = camera->shifty * fac * 2 * scale[1];
+ facx = fac * r_asp[0] * scale_x;
+ facy = fac * r_asp[1] * scale_y;
+ r_shift[0] = camera->shiftx * fac * 2.0f * scale_x;
+ r_shift[1] = camera->shifty * fac * 2.0f * scale_y;
}
r_vec[0][0] = r_shift[0] + facx; r_vec[0][1] = r_shift[1] + facy; r_vec[0][2] = depth;
Modified: branches/soc-2013-dingto/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/intern/context.c 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/blenkernel/intern/context.c 2013-07-28 06:17:10 UTC (rev 58682)
@@ -531,12 +531,12 @@
return CTX_data_dir_get_ex(C, TRUE, FALSE, FALSE);
}
-int CTX_data_equals(const char *member, const char *str)
+bool CTX_data_equals(const char *member, const char *str)
{
return (strcmp(member, str) == 0);
}
-int CTX_data_dir(const char *member)
+bool CTX_data_dir(const char *member)
{
return member[0] == '\0';
}
Modified: branches/soc-2013-dingto/source/blender/blenkernel/intern/deform.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/intern/deform.c 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/blenkernel/intern/deform.c 2013-07-28 06:17:10 UTC (rev 58682)
@@ -537,7 +537,7 @@
body[0] = suf[0] = '\0';
- for (i = len - 1; i > 1; i--) {
+ for (i = len; i > 0; i--) {
if (is_char_sep(string[i])) {
BLI_strncpy(body, string, i + 1);
BLI_strncpy(suf, string + i, (len + 1) - i);
@@ -545,7 +545,7 @@
}
}
- BLI_strncpy(body, string, len);
+ memcpy(body, string, len + 1);
}
/* "a.b.c" -> ("a.", "b.c") */
Modified: branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c 2013-07-28 06:17:10 UTC (rev 58682)
@@ -1582,17 +1582,17 @@
if (DM_release(dm)) {
if (bmdm->vertexCos) {
- MEM_freeN(bmdm->vertexCos);
+ MEM_freeN((void *)bmdm->vertexCos);
if (bmdm->vertexNos) {
- MEM_freeN(bmdm->vertexNos);
+ MEM_freeN((void *)bmdm->vertexNos);
}
if (bmdm->polyNos) {
- MEM_freeN(bmdm->polyNos);
+ MEM_freeN((void *)bmdm->polyNos);
}
}
if (bmdm->polyCos) {
- MEM_freeN(bmdm->polyCos);
+ MEM_freeN((void *)bmdm->polyCos);
}
MEM_freeN(bmdm);
Modified: branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c 2013-07-28 05:54:17 UTC (rev 58681)
+++ branches/soc-2013-dingto/source/blender/blenkernel/intern/mesh_validate.c 2013-07-28 06:17:10 UTC (rev 58682)
@@ -294,7 +294,7 @@
# define CHECK_FACE_EDGE(a, b) \
if (!BLI_edgehash_haskey(edge_hash, mf->a, mf->b)) { \
PRINT(" face %u: edge " STRINGIFY(a) "/" STRINGIFY(b) \
- " (%u,%u) is missing egde data\n", i, mf->a, mf->b); \
+ " (%u,%u) is missing edge data\n", i, mf->a, mf->b); \
do_edge_recalc = TRUE; \
} (void)0
Modified: branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list