[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59350] branches/soc-2013-depsgraph_mt: Merging r59317 through r59349 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Wed Aug 21 10:20:34 CEST 2013
Revision: 59350
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59350
Author: nazgul
Date: 2013-08-21 08:20:33 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Merging r59317 through r59349 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59317
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59349
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-depsgraph_mt/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-depsgraph_mt/intern/cycles/render/curves.h
branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/sound.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/sort.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/bmesh.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_fill_edgeloop.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_templates.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-depsgraph_mt/source/blender/editors/render/render_internal.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/image_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/space_image.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-depsgraph_mt/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-depsgraph_mt/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-depsgraph_mt/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-depsgraph_mt/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_RaySensor.h
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
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,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59316
+ /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,58822,58989
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-59349
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/blender/blender_curves.cpp 2013-08-21 08:20:33 UTC (rev 59350)
@@ -711,8 +711,6 @@
void BlenderSync::sync_curve_settings()
{
PointerRNA csscene = RNA_pointer_get(&b_scene.ptr, "cycles_curves");
-
- int preset = CURVE_ACCURATE_PRESET;
CurveSystemManager *curve_system_manager = scene->curve_system_manager;
CurveSystemManager prev_curve_system_manager = *curve_system_manager;
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/kernel/kernel_bvh.h 2013-08-21 08:20:33 UTC (rev 59350)
@@ -782,6 +782,7 @@
#if defined(__SUBSURFACE__)
#define BVH_FUNCTION_NAME bvh_intersect_subsurface
+#define BVH_FUNCTION_FEATURES 0
#include "kernel_bvh_subsurface.h"
#endif
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/kernel/osl/osl_shader.cpp 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/kernel/osl/osl_shader.cpp 2013-08-21 08:20:33 UTC (rev 59350)
@@ -189,6 +189,8 @@
sc.sample_weight = sample_weight;
sc.type = CLOSURE_EMISSION_ID;
+ sc.data0 = 0.0f;
+ sc.data1 = 0.0f;
sc.prim = NULL;
/* flag */
@@ -204,6 +206,8 @@
sc.sample_weight = sample_weight;
sc.type = CLOSURE_AMBIENT_OCCLUSION_ID;
+ sc.data0 = 0.0f;
+ sc.data1 = 0.0f;
sc.prim = NULL;
if(sd->num_closure < MAX_CLOSURE) {
@@ -215,6 +219,8 @@
case OSL::ClosurePrimitive::Holdout: {
sc.sample_weight = 0.0f;
sc.type = CLOSURE_HOLDOUT_ID;
+ sc.data0 = 0.0f;
+ sc.data1 = 0.0f;
sc.prim = NULL;
if(sd->num_closure < MAX_CLOSURE) {
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/render/curves.h
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/render/curves.h 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/render/curves.h 2013-08-21 08:20:33 UTC (rev 59350)
@@ -29,16 +29,6 @@
void curvebounds(float *lower, float *upper, float3 *p, int dim);
-typedef enum curve_presets {
- CURVE_CUSTOM,
- CURVE_FAST_PLANES,
- CURVE_TANGENT_SHADING,
- CURVE_TRUE_NORMAL,
- CURVE_ACCURATE_PRESET,
- CURVE_SMOOTH_CURVES,
- CURVE_SMOOTH_RIBBONS
-} curve_presets;
-
typedef enum curve_primitives {
CURVE_TRIANGLES,
CURVE_LINE_SEGMENTS,
Modified: branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/release/scripts/startup/bl_operators/wm.py 2013-08-21 08:20:33 UTC (rev 59350)
@@ -1762,12 +1762,12 @@
self.report({'ERROR'}, "Failed to get addons path")
return {'CANCELLED'}
- # create dir is if missing.
- try:
- os.makedirs(path_addons, exist_ok=True)
- except:
- import traceback
- traceback.print_exc()
+ if not os.path.isdir(path_addons):
+ try:
+ os.makedirs(path_addons, exist_ok=True)
+ except:
+ import traceback
+ traceback.print_exc()
# Check if we are installing from a target path,
# doing so causes 2+ addons of same name or when the same from/to
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mesh.h 2013-08-21 08:20:33 UTC (rev 59350)
@@ -332,10 +332,10 @@
/* vertex level transformations & checks (no derived mesh) */
-int BKE_mesh_minmax(struct Mesh *me, float r_min[3], float r_max[3]);
-int BKE_mesh_center_median(struct Mesh *me, float cent[3]);
-int BKE_mesh_center_bounds(struct Mesh *me, float cent[3]);
-int BKE_mesh_center_centroid(struct Mesh *me, float cent[3]);
+bool BKE_mesh_minmax(struct Mesh *me, float r_min[3], float r_max[3]);
+bool BKE_mesh_center_median(struct Mesh *me, float cent[3]);
+bool BKE_mesh_center_bounds(struct Mesh *me, float cent[3]);
+bool BKE_mesh_center_centroid(struct Mesh *me, float cent[3]);
void BKE_mesh_translate(struct Mesh *me, const float offset[3], const bool do_keys);
/* mesh_validate.c */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_sequencer.h 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_sequencer.h 2013-08-21 08:20:33 UTC (rev 59350)
@@ -318,6 +318,8 @@
void BKE_sequencer_update_muting(struct Editing *ed);
void BKE_sequencer_update_sound(struct Scene *scene, struct bSound *sound);
+void BKE_sequencer_refresh_sound_length(struct Scene *scene);
+
void BKE_sequence_base_unique_name_recursive(ListBase *seqbasep, struct Sequence *seq);
void BKE_sequence_base_dupli_recursive(struct Scene *scene, struct Scene *scene_to, ListBase *nseqbase, ListBase *seqbase, int dupe_flag);
bool BKE_sequence_is_valid_check(struct Sequence *seq);
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mesh.c 2013-08-21 08:20:33 UTC (rev 59350)
@@ -3667,7 +3667,7 @@
/* basic vertex data functions */
-int BKE_mesh_minmax(Mesh *me, float r_min[3], float r_max[3])
+bool BKE_mesh_minmax(Mesh *me, float r_min[3], float r_max[3])
{
int i = me->totvert;
MVert *mvert;
@@ -3678,7 +3678,7 @@
return (me->totvert != 0);
}
-int BKE_mesh_center_median(Mesh *me, float cent[3])
+bool BKE_mesh_center_median(Mesh *me, float cent[3])
{
int i = me->totvert;
MVert *mvert;
@@ -3694,19 +3694,19 @@
return (me->totvert != 0);
}
-int BKE_mesh_center_bounds(Mesh *me, float cent[3])
+bool BKE_mesh_center_bounds(Mesh *me, float cent[3])
{
float min[3], max[3];
INIT_MINMAX(min, max);
if (BKE_mesh_minmax(me, min, max)) {
mid_v3_v3v3(cent, min, max);
- return 1;
+ return true;
}
- return 0;
+ return false;
}
-int BKE_mesh_center_centroid(Mesh *me, float cent[3])
+bool BKE_mesh_center_centroid(Mesh *me, float cent[3])
{
int i = me->totpoly;
MPoly *mpoly;
@@ -3728,6 +3728,11 @@
mul_v3_fl(cent, 1.0f / total_area);
}
+ /* zero area faces cause this, fallback to median */
+ if (UNLIKELY(!is_finite_v3(cent))) {
+ return BKE_mesh_center_median(me, cent);
+ }
+
return (me->totpoly != 0);
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-08-21 07:52:31 UTC (rev 59349)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-08-21 08:20:33 UTC (rev 59350)
@@ -52,7 +52,7 @@
edges[j] = etable[ml->e];
}
- return BM_face_create(bm, verts, edges, mp->totloop, BM_CREATE_SKIP_CD);
+ return BM_face_create(bm, verts, edges, mp->totloop, NULL, BM_CREATE_SKIP_CD);
}
/**
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-08-21 07:52:31 UTC (rev 59349)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list