[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58475] branches/soc-2013-depsgraph_mt: Merging r58464 through r58474 from trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Sun Jul 21 16:35:33 CEST 2013
Revision: 58475
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58475
Author: nazgul
Date: 2013-07-21 14:35:33 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
Merging r58464 through r58474 from trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58464
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58474
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/intern/cycles/util/util_task.cpp
branches/soc-2013-depsgraph_mt/source/blender/avi/intern/avi_options.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/armature.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editmesh.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/image.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/library.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/paint.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/text.c
branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_color.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/noise.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/path_util.c
branches/soc-2013-depsgraph_mt/source/blender/blenlib/intern/string.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-depsgraph_mt/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2013-depsgraph_mt/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/anim_markers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/animation/keyframing.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/resources.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mask/mask_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-depsgraph_mt/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_hook.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_lattice.c
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/screen/screen_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-depsgraph_mt/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_action/space_action.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_file/filelist.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_image/space_image.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_info/space_info.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/space_text.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_time/space_time.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_generics.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-depsgraph_mt/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-depsgraph_mt/source/blender/editors/util/numinput.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-depsgraph_mt/source/blender/imbuf/intern/png.c
branches/soc-2013-depsgraph_mt/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2013-depsgraph_mt/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna.c
branches/soc-2013-depsgraph_mt/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-depsgraph_mt/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-depsgraph_mt/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-depsgraph_mt/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2013-depsgraph_mt/source/tools/check_style_c.py
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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-58463
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-58474
Modified: branches/soc-2013-depsgraph_mt/intern/cycles/util/util_task.cpp
===================================================================
--- branches/soc-2013-depsgraph_mt/intern/cycles/util/util_task.cpp 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/intern/cycles/util/util_task.cpp 2013-07-21 14:35:33 UTC (rev 58475)
@@ -189,10 +189,6 @@
/* automatic number of threads */
num_threads = system_cpu_thread_count();
}
- else {
- /* manual number of threads */
- num_threads;
- }
/* launch threads that will be waiting for work */
threads.resize(num_threads);
Modified: branches/soc-2013-depsgraph_mt/source/blender/avi/intern/avi_options.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/avi/intern/avi_options.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/avi/intern/avi_options.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -112,7 +112,7 @@
awrite(movie, movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
}
-
+ break;
}
fseek(movie->fp, movie->offset_table[0], SEEK_SET);
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/armature.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/armature.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -1324,6 +1324,7 @@
mat3_to_compatible_eulO(pchan->eul, pchan->eul, pchan->rotmode, mat);
else
mat3_to_eulO(pchan->eul, pchan->rotmode, mat);
+ break;
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -2213,6 +2213,7 @@
break;
default: /* CU_TWIST_Z_UP default, pre 2.49c */
make_bevel_list_3D_zup(bl);
+ break;
}
if (bl->poly == -1) /* check its not cyclic */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/customdata.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -2391,6 +2391,7 @@
BLI_assert(!"invalid type given");
iter_type = BM_VERTS_OF_MESH;
totelem = bm->totvert;
+ break;
}
dest->pool = NULL;
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/depsgraph.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/depsgraph.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -559,6 +559,7 @@
}
else
dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Parent");
+ break;
}
/* exception case: parent is duplivert */
if (ob->type == OB_MBALL && (ob->parent->transflag & OB_DUPLIVERTS)) {
@@ -620,8 +621,8 @@
node2 = dag_get_node(dag, cam->dof_ob);
dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Camera DoF");
}
+ break;
}
- break;
case OB_MBALL:
{
Object *mom = BKE_mball_basis_find(scene, ob);
@@ -630,8 +631,8 @@
node2 = dag_get_node(dag, mom);
dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Metaball"); /* mom depends on children! */
}
+ break;
}
- break;
case OB_CURVE:
case OB_FONT:
{
@@ -651,8 +652,8 @@
dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Texture On Curve");
}
}
+ break;
}
- break;
}
/* material drivers */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editmesh.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editmesh.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/editmesh.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -373,5 +373,6 @@
break;
default:
BLI_assert(0);
+ break;
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fcurve.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fcurve.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -1764,6 +1764,7 @@
* This is currently used as the mechanism which allows animated settings to be able
* to be changed via the UI.
*/
+ break;
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fmodifier.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fmodifier.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/fmodifier.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -343,6 +343,8 @@
}
default:
printf("Invalid Function-Generator for F-Modifier - %d\n", data->type);
+ break;
+
}
/* execute function callback to set value if appropriate */
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/idprop.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/idprop.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/idprop.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -445,6 +445,7 @@
IDP_FreeProperty(tmp);
MEM_freeN(tmp);
+ break;
}
}
}
@@ -709,9 +710,7 @@
if (prop1->len == prop2->len && prop1->subtype == prop2->subtype) {
return memcmp(IDP_Array(prop1), IDP_Array(prop2), idp_size_table[(int)prop1->subtype] * prop1->len);
}
- else {
- return 0;
- }
+ return 0;
case IDP_GROUP:
{
IDProperty *link1, *link2;
@@ -813,9 +812,7 @@
prop->len = prop->totallen = val->array.len;
break;
}
- else {
- return NULL;
- }
+ return NULL;
}
case IDP_STRING:
{
@@ -911,5 +908,6 @@
switch (prop->type) {
case IDP_ID:
IDP_UnlinkID(prop);
+ break;
}
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/image.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/image.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -695,6 +695,7 @@
break;
default:
BKE_image_buf_fill_color(rect, rect_float, width, height, color);
+ break;
}
if (rect_float) {
@@ -1120,6 +1121,7 @@
case R_IMF_IMTYPE_QUICKTIME:
case R_IMF_IMTYPE_DPX:
chan_flag |= IMA_CHAN_FLAG_ALPHA;
+ break;
}
/* bw */
@@ -1131,6 +1133,7 @@
case R_IMF_IMTYPE_TIFF:
case R_IMF_IMTYPE_IRIS:
chan_flag |= IMA_CHAN_FLAG_BW;
+ break;
}
return chan_flag;
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/library.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/library.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/library.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -1057,6 +1057,7 @@
case 32: BKE_libblock_free(lb, id); break;
default:
BLI_assert(0);
+ break;
}
#endif
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c 2013-07-21 14:27:19 UTC (rev 58474)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/object.c 2013-07-21 14:35:33 UTC (rev 58475)
@@ -1644,6 +1644,7 @@
if (use_compat) mat3_to_compatible_eulO(ob->rot, ob->rot, ob->rotmode, tmat);
else mat3_to_eulO(ob->rot, ob->rotmode, tmat);
+ break;
}
}
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list