[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58856] branches/soc-2013-dingto: Merged revision(s) 58785-58855 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Sat Aug 3 14:49:08 CEST 2013
Revision: 58856
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58856
Author: dingto
Date: 2013-08-03 12:49:08 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Merged revision(s) 58785-58855 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/extern/libmv/libmv-capi.cc
branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py
branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-dingto/intern/ghost/CMakeLists.txt
branches/soc-2013-dingto/intern/ghost/SConscript
branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/dynamicpaint.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/smoke.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-dingto/source/blender/blenloader/intern/readfile.c
branches/soc-2013-dingto/source/blender/blenloader/intern/writefile.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-dingto/source/blender/collada/MeshImporter.cpp
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-dingto/source/blender/editors/space_logic/logic_window.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2013-dingto/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_brush.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-dingto/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2013-dingto/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/soc-2013-dingto/source/gameengine/SceneGraph/SG_Tree.cpp
branches/soc-2013-dingto/source/gameengine/VideoTexture/BlendType.h
branches/soc-2013-dingto/source/gameengine/VideoTexture/Exception.cpp
branches/soc-2013-dingto/source/gameengine/VideoTexture/FilterSource.h
branches/soc-2013-dingto/source/gameengine/VideoTexture/ImageMix.h
branches/soc-2013-dingto/source/gameengine/VideoTexture/ImageRender.cpp
Property Changed:
----------------
branches/soc-2013-dingto/
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-58770,58779,58783-58784
+ /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-58770,58779,58783-58855
Modified: branches/soc-2013-dingto/extern/libmv/libmv-capi.cc
===================================================================
--- branches/soc-2013-dingto/extern/libmv/libmv-capi.cc 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/extern/libmv/libmv-capi.cc 2013-08-03 12:49:08 UTC (rev 58856)
@@ -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-dingto/intern/cycles/blender/addon/ui.py
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/intern/cycles/blender/addon/ui.py 2013-08-03 12:49:08 UTC (rev 58856)
@@ -68,8 +68,10 @@
row = layout.row()
row.prop(cscene, "progressive")
- row.prop(cscene, "squared_samples")
+ if not cscene.progressive:
+ row.prop(cscene, "squared_samples")
+
split = layout.split()
col = split.column()
Modified: branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/intern/cycles/blender/blender_sync.cpp 2013-08-03 12:49:08 UTC (rev 58856)
@@ -321,7 +321,7 @@
render_layer.bound_samples = (use_layer_samples == 1);
if(use_layer_samples != 2) {
int samples = b_rlay->samples();
- if(get_boolean(cscene, "squared_samples"))
+ if(get_boolean(cscene, "squared_samples") && !(get_boolean(cscene, "progressive")))
render_layer.samples = samples * samples;
else
render_layer.samples = samples;
@@ -414,10 +414,9 @@
int preview_samples = get_int(cscene, "preview_samples");
int preview_aa_samples = get_int(cscene, "preview_aa_samples");
+ /* Squared samples for Non-Progressive only */
if(get_boolean(cscene, "squared_samples")) {
- samples = samples * samples;
aa_samples = aa_samples * aa_samples;
- preview_samples = preview_samples * preview_samples;
preview_aa_samples = preview_aa_samples * preview_aa_samples;
}
Modified: branches/soc-2013-dingto/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2013-dingto/intern/ghost/CMakeLists.txt 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/intern/ghost/CMakeLists.txt 2013-08-03 12:49:08 UTC (rev 58856)
@@ -315,5 +315,7 @@
endif()
+add_definitions(-DGLEW_STATIC)
+
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/soc-2013-dingto/intern/ghost/SConscript
===================================================================
--- branches/soc-2013-dingto/intern/ghost/SConscript 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/intern/ghost/SConscript 2013-08-03 12:49:08 UTC (rev 58856)
@@ -38,7 +38,7 @@
pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager']
-defs=['_USE_MATH_DEFINES']
+defs=['_USE_MATH_DEFINES', 'GLEW_STATIC']
incs = [
'.',
@@ -142,7 +142,6 @@
except ValueError:
pass
-
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
incs += ' ../utfconv'
Modified: branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/final.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/final.py 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/final.py 2013-08-03 12:49:08 UTC (rev 58856)
@@ -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-dingto/release/scripts/presets/cycles/sampling/preview.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/preview.py 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/release/scripts/presets/cycles/sampling/preview.py 2013-08-03 12:49:08 UTC (rev 58856)
@@ -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-dingto/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py 2013-08-03 12:49:08 UTC (rev 58856)
@@ -201,6 +201,7 @@
col = split.column(align=True)
col.prop(surface, "wave_damping")
col.prop(surface, "wave_spring")
+ col.prop(surface, "wave_smoothness")
layout.separator()
layout.prop(surface, "brush_group")
Modified: branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h 2013-08-03 12:49:08 UTC (rev 58856)
@@ -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-dingto/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-03 11:35:09 UTC (rev 58855)
+++ branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-03 12:49:08 UTC (rev 58856)
@@ -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);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list