[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45793] branches/soc-2011-tomato: Merging r45748 through r45791 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Thu Apr 19 21:03:37 CEST 2012
Revision: 45793
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45793
Author: nazgul
Date: 2012-04-19 19:03:35 +0000 (Thu, 19 Apr 2012)
Log Message:
-----------
Merging r45748 through r45791 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45748
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45791
Modified Paths:
--------------
branches/soc-2011-tomato/intern/cycles/render/film.cpp
branches/soc-2011-tomato/intern/opennl/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h
branches/soc-2011-tomato/source/blender/blenlib/intern/rand.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh_validate.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_private.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_create.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_edgesplit.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_mirror.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_slide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2011-tomato/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_bvh.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_bvh.h
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
branches/soc-2011-tomato/source/blender/editors/render/render_shading.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-tomato/source/blender/editors/util/crazyspace.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.h
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /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-45747
+ /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-45791
Modified: branches/soc-2011-tomato/intern/cycles/render/film.cpp
===================================================================
--- branches/soc-2011-tomato/intern/cycles/render/film.cpp 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/intern/cycles/render/film.cpp 2012-04-19 19:03:35 UTC (rev 45793)
@@ -125,7 +125,6 @@
break;
case PASS_AO:
pass.components = 4;
- pass.exposure = true;
break;
case PASS_SHADOW:
pass.components = 4;
Modified: branches/soc-2011-tomato/intern/opennl/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/opennl/CMakeLists.txt 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/intern/opennl/CMakeLists.txt 2012-04-19 19:03:35 UTC (rev 45793)
@@ -28,7 +28,7 @@
# remove debug flag here since this is not a blender maintained library
# and debug gives a lot of prints on UV unwrapping. developers can enable if they need to.
-remove_cc_flag("-DDEBUG")
+add_definitions(-UDEBUG)
# quiet compiler warnings about undefined defines
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2012-04-19 19:03:35 UTC (rev 45793)
@@ -51,7 +51,7 @@
/* can be left blank, otherwise a,b,c... etc with no quotes */
#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE beta
+#define BLENDER_VERSION_CYCLE rc
extern char versionstr[]; /* from blender.c */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/bvhutils.c 2012-04-19 19:03:35 UTC (rev 45793)
@@ -572,7 +572,7 @@
insert = 0;
}
else {
- BM_ITER(v, &iter, em->bm, BM_VERTS_OF_FACE, f) {
+ BM_ITER_ELEM (v, &iter, f, BM_VERTS_OF_FACE) {
if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
/* Don't insert triangles tessellated from faces that have
* any selected verts.*/
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-04-19 19:03:35 UTC (rev 45793)
@@ -1929,7 +1929,7 @@
mp->loopstart = j;
mp->mat_nr = efa->mat_nr;
- BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, efa) {
+ BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
mloop->v = BM_elem_index_get(l->v);
mloop->e = BM_elem_index_get(l->e);
CustomData_from_bmesh_block(&bm->ldata, &dm->loopData, l->head.data, j);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c 2012-04-19 19:03:35 UTC (rev 45793)
@@ -2191,7 +2191,7 @@
if (t != BM_LOOPS_OF_FACE) {
/*ensure all current elements follow new customdata layout*/
- BM_ITER(h, &iter, bm, t, NULL) {
+ BM_ITER_MESH (h, &iter, bm, t) {
tmp = NULL;
CustomData_bmesh_copy_data(&destold, dest, h->data, &tmp);
CustomData_bmesh_free_block(&destold, &h->data);
@@ -2204,8 +2204,8 @@
BMIter liter;
/*ensure all current elements follow new customdata layout*/
- BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
- BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
tmp = NULL;
CustomData_bmesh_copy_data(&destold, dest, l->head.data, &tmp);
CustomData_bmesh_free_block(&destold, &l->head.data);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c 2012-04-19 19:03:35 UTC (rev 45793)
@@ -493,7 +493,7 @@
BMIter iter;
glBegin(GL_LINES);
- BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
+ BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
BMIter liter;
BMLoop *l;
MLoopUV *lastluv = NULL, *firstluv = NULL;
@@ -501,7 +501,7 @@
if (BM_elem_flag_test(efa, BM_ELEM_HIDDEN))
continue;
- BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_FACE, efa) {
+ BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) {
MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
if (luv) {
@@ -1468,8 +1468,8 @@
BM_mesh_elem_index_ensure(bm, BM_VERT | BM_EDGE);
- BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
- BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
+ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
+ BM_ITER_ELEM (l, &liter, f, BM_LOOPS_OF_FACE) {
loop_r->v = BM_elem_index_get(l->v);
loop_r->e = BM_elem_index_get(l->e);
loop_r++;
@@ -1486,7 +1486,7 @@
int i;
i = 0;
- BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
+ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
poly_r->flag = BM_face_flag_to_mflag(f);
poly_r->loopstart = i;
poly_r->totloop = f->len;
@@ -1559,7 +1559,7 @@
int i;
i= 0;
- BM_ITER(eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER_MESH (eve, &iter, emdm->tc->bm, BM_VERTS_OF_MESH) {
if (emdm->vertexCos) {
copy_v3_v3(cos_r[i], emdm->vertexCos[i]);
}
@@ -1709,7 +1709,7 @@
bmdm->polyNos = MEM_mallocN(sizeof(*bmdm->polyNos)*bm->totface, "bmdm_pno");
i = 0;
- BM_ITER(efa, &fiter, bm, BM_FACES_OF_MESH, NULL) {
+ BM_ITER_MESH (efa, &fiter, bm, BM_FACES_OF_MESH) {
BM_elem_index_set(efa, i); /* set_inline */
BM_face_normal_update_vcos(bm, efa, bmdm->polyNos[i], (float const (*)[3])vertexCos);
i++;
@@ -1719,7 +1719,7 @@
eve=BM_iter_new(&viter, bm, BM_VERTS_OF_MESH, NULL);
for (i=0; eve; eve=BM_iter_step(&viter), i++) {
float *no = bmdm->vertexNos[i];
- BM_ITER(efa, &fiter, bm, BM_FACES_OF_VERT, eve) {
+ BM_ITER_ELEM (efa, &fiter, eve, BM_FACES_OF_VERT) {
add_v3_v3(no, bmdm->polyNos[BM_elem_index_get(efa)]);
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c 2012-04-19 19:03:35 UTC (rev 45793)
@@ -520,7 +520,7 @@
a = 0;
co = MEM_callocN(sizeof(float) * 3 * me->edit_btmesh->bm->totvert, "key_block_get_data");
- BM_ITER(eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER_MESH (eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH) {
copy_v3_v3(co[a], eve->co);
a++;
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c 2012-04-19 19:03:35 UTC (rev 45793)
@@ -1770,7 +1770,7 @@
BMVert *eve;
BMIter iter;
- BM_ITER(eve, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {
int *keyindex = CustomData_bmesh_get(&em->bm->vdata, eve->head.data, CD_SHAPE_KEYINDEX);
if (keyindex && *keyindex==nr) {
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/text.c 2012-04-19 19:03:35 UTC (rev 45793)
@@ -2560,6 +2560,8 @@
txt_combine_lines(text, text->curl, text->curl->next);
txt_pop_sel(text);
}
+ else
+ return;
}
else { /* Just deleting a char */
size_t c_len = 0;
Modified: branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h 2012-04-19 19:03:15 UTC (rev 45792)
+++ branches/soc-2011-tomato/source/blender/blenlib/BLI_scanfill.h 2012-04-19 19:03:35 UTC (rev 45793)
@@ -51,7 +51,7 @@
* only to be used within loops, and not by one function at a time
* free in the end, with argument '-1'
*/
- #define MEM_ELEM_BLOCKSIZE 16384
+#define MEM_ELEM_BLOCKSIZE 16384
struct mem_elements *melem__cur;
int melem__offs; /* the current free address */
ListBase melem__lb;
@@ -66,8 +66,8 @@
struct ScanFillVert *next, *prev;
union {
struct ScanFillVert *v;
- void *p;
- intptr_t l;
+ void *p;
+ intptr_t l;
} tmp;
float co[3]; /* vertex location */
float xy[2]; /* 2D copy of vertex location (using dominant axis) */
@@ -94,10 +94,6 @@
struct ScanFillVert *BLI_addfillvert(ScanFillContext *sf_ctx, const float vec[3]);
struct ScanFillEdge *BLI_addfilledge(ScanFillContext *sf_ctx, struct ScanFillVert *v1, struct ScanFillVert *v2);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list