[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58817] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Fri Aug 2 06:24:55 CEST 2013
Revision: 58817
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58817
Author: gdh
Date: 2013-08-02 04:24:55 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58800 to r58816.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58800
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58816
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc
branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_skin.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58772,58774-58775
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58799
+ /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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58772,58774-58775
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-58816
Modified: branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc 2013-08-02 00:53:45 UTC (rev 58816)
+++ branches/soc-2013-cycles_mblur/extern/libmv/libmv-capi.cc 2013-08-02 04:24:55 UTC (rev 58817)
@@ -1014,6 +1014,7 @@
*principal_y = camera_intrinsics->principal_point_y();
*k1 = camera_intrinsics->k1();
*k2 = camera_intrinsics->k2();
+ *k3 = camera_intrinsics->k3();
}
void libmv_cameraIntrinsicsUndistortByte(const struct libmv_CameraIntrinsics *libmv_intrinsics,
Modified: branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py 2013-08-02 00:53:45 UTC (rev 58816)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py 2013-08-02 04:24:55 UTC (rev 58817)
@@ -3,10 +3,13 @@
cycles.squared_samples = True
-cycles.samples = 24
-cycles.preview_samples = 24
+# Progressive
+cycles.samples = 500
+cycles.preview_samples = 100
+
+# Non-Progressive (squared)
cycles.aa_samples = 8
-cycles.preview_aa_samples = 8
+cycles.preview_aa_samples = 4
cycles.diffuse_samples = 3
cycles.glossy_samples = 2
Modified: branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py 2013-08-02 00:53:45 UTC (rev 58816)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py 2013-08-02 04:24:55 UTC (rev 58817)
@@ -3,10 +3,13 @@
cycles.squared_samples = True
-cycles.samples = 12
-cycles.preview_samples = 12
+# Progressive
+cycles.samples = 100
+cycles.preview_samples = 10
+
+# Non-Progressive (squared)
cycles.aa_samples = 4
-cycles.preview_aa_samples = 4
+cycles.preview_aa_samples = 2
cycles.diffuse_samples = 3
cycles.glossy_samples = 2
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h 2013-08-02 00:53:45 UTC (rev 58816)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_blender.h 2013-08-02 04:24:55 UTC (rev 58817)
@@ -42,8 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 268
-#define BLENDER_SUBVERSION 1
-
+#define BLENDER_SUBVERSION 2
/* 262 was the last editmesh release but it has compatibility code for bmesh data */
#define BLENDER_MINVERSION 262
#define BLENDER_MINSUBVERSION 0
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-02 00:53:45 UTC (rev 58816)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-02 04:24:55 UTC (rev 58817)
@@ -1969,8 +1969,7 @@
index = dm->getVertDataArray(dm, CD_ORIGINDEX);
- eve = BM_iter_new(&iter, bm, BM_VERTS_OF_MESH, NULL);
- for (i = 0; eve; eve = BM_iter_step(&iter), i++, index++) {
+ BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, i) {
MVert *mv = &mvert[i];
copy_v3_v3(mv->co, eve->co);
@@ -1983,15 +1982,14 @@
if (cd_vert_bweight_offset != -1) mv->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eve, cd_vert_bweight_offset);
- if (add_orig) *index = i;
+ if (add_orig) *index++ = i;
CustomData_from_bmesh_block(&bm->vdata, &dm->vertData, eve->head.data, i);
}
bm->elem_index_dirty &= ~BM_VERT;
index = dm->getEdgeDataArray(dm, CD_ORIGINDEX);
- eed = BM_iter_new(&iter, bm, BM_EDGES_OF_MESH, NULL);
- for (i = 0; eed; eed = BM_iter_step(&iter), i++, index++) {
+ BM_ITER_MESH_INDEX (eed, &iter, bm, BM_EDGES_OF_MESH, i) {
MEdge *med = &medge[i];
BM_elem_index_set(eed, i); /* set_inline */
@@ -2013,7 +2011,7 @@
if (cd_edge_bweight_offset != -1) med->bweight = BM_ELEM_CD_GET_FLOAT_AS_UCHAR(eed, cd_edge_bweight_offset);
CustomData_from_bmesh_block(&bm->edata, &dm->edgeData, eed->head.data, i);
- if (add_orig) *index = i;
+ if (add_orig) *index++ = i;
}
bm->elem_index_dirty &= ~BM_EDGE;
@@ -2023,7 +2021,7 @@
BM_mesh_elem_index_ensure(bm, BM_FACE);
index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
- for (i = 0; i < dm->numTessFaceData; i++, index++) {
+ for (i = 0; i < dm->numTessFaceData; i++) {
MFace *mf = &mface[i];
const BMLoop **l = em_looptris[i];
efa = l[0]->f;
@@ -2036,7 +2034,7 @@
mf->flag = BM_face_flag_to_mflag(efa);
/* map mfaces to polygons in the same cddm intentionally */
- *index = BM_elem_index_get(efa);
+ *index++ = BM_elem_index_get(efa);
loops_to_customdata_corners(bm, &dm->faceData, i, l, numCol, numTex);
test_index_face(mf, &dm->faceData, i, 3);
@@ -2045,8 +2043,7 @@
index = CustomData_get_layer(&dm->polyData, CD_ORIGINDEX);
j = 0;
- efa = BM_iter_new(&iter, bm, BM_FACES_OF_MESH, NULL);
- for (i = 0; efa; i++, efa = BM_iter_step(&iter), index++) {
+ BM_ITER_MESH_INDEX (efa, &iter, bm, BM_FACES_OF_MESH, i) {
BMLoop *l_iter;
BMLoop *l_first;
MPoly *mp = &mpoly[i];
@@ -2070,7 +2067,7 @@
CustomData_from_bmesh_block(&bm->pdata, &dm->polyData, efa->head.data, i);
- if (add_orig) *index = i;
+ if (add_orig) *index++ = i;
}
bm->elem_index_dirty &= ~BM_FACE;
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/smoke.c 2013-08-02 00:53:45 UTC (rev 58816)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/smoke.c 2013-08-02 04:24:55 UTC (rev 58817)
@@ -259,7 +259,10 @@
zero_v3_int(sds->base_res);
copy_v3_v3(sds->cell_size, size);
}
- mul_v3_v3(size, ob->size);
+ /* apply object scale */
+ for (i = 0; i < 3; i++) {
+ size[i] = fabs(size[i] * ob->size[i]);
+ }
copy_v3_v3(sds->global_size, size);
copy_v3_v3(sds->dp0, min);
@@ -272,21 +275,21 @@
/* define grid resolutions from longest domain side */
if (size[0] >= MAX2(size[1], size[2])) {
scale = res / size[0];
- sds->scale = size[0] / ob->size[0];
+ sds->scale = size[0] / fabs(ob->size[0]);
sds->base_res[0] = res;
sds->base_res[1] = (int)(size[1] * scale + 0.5f);
sds->base_res[2] = (int)(size[2] * scale + 0.5f);
}
else if (size[1] >= MAX2(size[0], size[2])) {
scale = res / size[1];
- sds->scale = size[1] / ob->size[1];
+ sds->scale = size[1] / fabs(ob->size[1]);
sds->base_res[0] = (int)(size[0] * scale + 0.5f);
sds->base_res[1] = res;
sds->base_res[2] = (int)(size[2] * scale + 0.5f);
}
else {
scale = res / size[2];
- sds->scale = size[2] / ob->size[2];
+ sds->scale = size[2] / fabs(ob->size[2]);
sds->base_res[0] = (int)(size[0] * scale + 0.5f);
sds->base_res[1] = (int)(size[1] * scale + 0.5f);
sds->base_res[2] = res;
Modified: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h 2013-08-02 00:53:45 UTC (rev 58816)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_geom.h 2013-08-02 04:24:55 UTC (rev 58817)
@@ -147,10 +147,6 @@
int isect_point_tri_v2_cw(const float pt[2], const float v1[2], const float v2[2], const float v3[2]);
int isect_point_tri_v2_int(const int x1, const int y1, const int x2, const int y2, const int a, const int b);
bool isect_point_tri_prism_v3(const float p[3], const float v1[3], const float v2[3], const float v3[3]);
-void isect_point_quad_uv_v2(const float v0[2], const float v1[2], const float v2[2], const float v3[2],
- const float pt[2], float r_uv[2]);
-void isect_point_face_uv_v2(const int isquad, const float v0[2], const float v1[2], const float v2[2],
- const float v3[2], const float pt[2], float r_uv[2]);
/* axis-aligned bounding box */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list