[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58585] branches/soc-2013-dingto: Merged revision(s) 58452-58584 from trunk/blender into soc-2013-dingto.
Thomas Dinges
blender at dingto.org
Wed Jul 24 23:56:07 CEST 2013
Revision: 58585
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58585
Author: dingto
Date: 2013-07-24 21:56:06 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
Merged revision(s) 58452-58584 from trunk/blender into soc-2013-dingto.
Modified Paths:
--------------
branches/soc-2013-dingto/intern/cycles/app/cycles_test.cpp
branches/soc-2013-dingto/intern/cycles/kernel/kernel_random.h
branches/soc-2013-dingto/intern/cycles/util/util_task.cpp
branches/soc-2013-dingto/intern/cycles/util/util_view.cpp
branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-dingto/source/blender/avi/intern/avi_options.c
branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_global.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-dingto/source/blender/blenkernel/BKE_text.h
branches/soc-2013-dingto/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-dingto/source/blender/blenkernel/intern/anim.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/armature.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/cloth.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/curve.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/editmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/image.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/library.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/mask.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/material.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/multires.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/object.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/paint.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-dingto/source/blender/blenkernel/intern/property.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/text.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/texture.c
branches/soc-2013-dingto/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-dingto/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-dingto/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-dingto/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-dingto/source/blender/blenlib/intern/fileops.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_color.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-dingto/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-dingto/source/blender/blenlib/intern/noise.c
branches/soc-2013-dingto/source/blender/blenlib/intern/path_util.c
branches/soc-2013-dingto/source/blender/blenlib/intern/storage.c
branches/soc-2013-dingto/source/blender/blenlib/intern/string.c
branches/soc-2013-dingto/source/blender/blenlib/intern/string_utf8.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/CMakeLists.txt
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-dingto/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2013-dingto/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-dingto/source/blender/compositor/intern/COM_SocketReader.h
branches/soc-2013-dingto/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_ConvertColorToValueProg.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MathBaseOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixAddOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixBurnOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixColorOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixDarkenOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixDifferenceOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixDivideOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixDodgeOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixHueOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixLightenOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixLinearLightOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixOverlayOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixSaturationOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixScreenOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixSoftLightOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixSubtractOperation.cpp
branches/soc-2013-dingto/source/blender/compositor/operations/COM_MixValueOperation.cpp
branches/soc-2013-dingto/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-dingto/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2013-dingto/source/blender/editors/animation/anim_markers.c
branches/soc-2013-dingto/source/blender/editors/animation/keyframing.c
branches/soc-2013-dingto/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-dingto/source/blender/editors/curve/curve_intern.h
branches/soc-2013-dingto/source/blender/editors/curve/curve_ops.c
branches/soc-2013-dingto/source/blender/editors/curve/editcurve.c
branches/soc-2013-dingto/source/blender/editors/curve/editfont.c
branches/soc-2013-dingto/source/blender/editors/include/ED_mesh.h
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_intern.h
branches/soc-2013-dingto/source/blender/editors/interface/interface_ops.c
branches/soc-2013-dingto/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-dingto/source/blender/editors/interface/resources.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_add.c
branches/soc-2013-dingto/source/blender/editors/mask/mask_ops.c
branches/soc-2013-dingto/source/blender/editors/mesh/editface.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-dingto/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-dingto/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-dingto/source/blender/editors/mesh/meshtools.c
branches/soc-2013-dingto/source/blender/editors/object/object_edit.c
branches/soc-2013-dingto/source/blender/editors/object/object_hook.c
branches/soc-2013-dingto/source/blender/editors/object/object_lattice.c
branches/soc-2013-dingto/source/blender/editors/object/object_modifier.c
branches/soc-2013-dingto/source/blender/editors/object/object_relations.c
branches/soc-2013-dingto/source/blender/editors/object/object_vgroup.c
branches/soc-2013-dingto/source/blender/editors/render/render_opengl.c
branches/soc-2013-dingto/source/blender/editors/screen/screen_ops.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/paint_vertex_proj.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-dingto/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2013-dingto/source/blender/editors/space_action/space_action.c
branches/soc-2013-dingto/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-dingto/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-dingto/source/blender/editors/space_file/filelist.c
branches/soc-2013-dingto/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-dingto/source/blender/editors/space_image/space_image.c
branches/soc-2013-dingto/source/blender/editors/space_info/space_info.c
branches/soc-2013-dingto/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-dingto/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-dingto/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-dingto/source/blender/editors/space_node/drawnode.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_add.c
branches/soc-2013-dingto/source/blender/editors/space_node/node_intern.h
branches/soc-2013-dingto/source/blender/editors/space_node/node_ops.c
branches/soc-2013-dingto/source/blender/editors/space_node/space_node.c
branches/soc-2013-dingto/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-dingto/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-dingto/source/blender/editors/space_text/space_text.c
branches/soc-2013-dingto/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-dingto/source/blender/editors/space_time/space_time.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-dingto/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.c
branches/soc-2013-dingto/source/blender/editors/transform/transform.h
branches/soc-2013-dingto/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_generics.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-dingto/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-dingto/source/blender/editors/util/crazyspace.c
branches/soc-2013-dingto/source/blender/editors/util/numinput.c
branches/soc-2013-dingto/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-dingto/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-dingto/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2013-dingto/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2013-dingto/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-dingto/source/blender/imbuf/intern/indexer.c
branches/soc-2013-dingto/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-dingto/source/blender/imbuf/intern/png.c
branches/soc-2013-dingto/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-dingto/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-dingto/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2013-dingto/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-dingto/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-dingto/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2013-dingto/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna.c
branches/soc-2013-dingto/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-dingto/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-dingto/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-dingto/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-dingto/source/creator/creator.c
branches/soc-2013-dingto/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-dingto/source/gameengine/Expressions/FloatValue.cpp
branches/soc-2013-dingto/source/gameengine/Expressions/IntValue.cpp
branches/soc-2013-dingto/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2013-dingto/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2013-dingto/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2013-dingto/source/tools/check_style_c.py
Removed Paths:
-------------
branches/soc-2013-dingto/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2013-dingto/source/blender/bmesh/tools/BME_bevel.c
Property Changed:
----------------
branches/soc-2013-dingto/
branches/soc-2013-dingto/source/blender/editors/interface/interface.c
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
+ /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-58584
Modified: branches/soc-2013-dingto/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/app/cycles_test.cpp 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/intern/cycles/app/cycles_test.cpp 2013-07-24 21:56:06 UTC (rev 58585)
@@ -181,7 +181,7 @@
options.session->reset(session_buffer_params(), options.session_params.samples);
}
-void keyboard(unsigned char key)
+static void keyboard(unsigned char key)
{
if(key == 'r')
options.session->reset(session_buffer_params(), options.session_params.samples);
Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_random.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_random.h 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_random.h 2013-07-24 21:56:06 UTC (rev 58585)
@@ -141,11 +141,13 @@
int p = *rng + dimension;
cmj_sample_2D(sample, num_samples, p, fx, fy);
}
+ else
#endif
-
- /* sobol */
- *fx = path_rng_1D(kg, rng, sample, num_samples, dimension);
- *fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);
+ {
+ /* sobol */
+ *fx = path_rng_1D(kg, rng, sample, num_samples, dimension);
+ *fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);
+ }
}
__device_inline void path_rng_init(KernelGlobals *kg, __global uint *rng_state, int sample, int num_samples, RNG *rng, int x, int y, float *fx, float *fy)
Modified: branches/soc-2013-dingto/intern/cycles/util/util_task.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/util/util_task.cpp 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/intern/cycles/util/util_task.cpp 2013-07-24 21:56:06 UTC (rev 58585)
@@ -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-dingto/intern/cycles/util/util_view.cpp
===================================================================
--- branches/soc-2013-dingto/intern/cycles/util/util_view.cpp 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/intern/cycles/util/util_view.cpp 2013-07-24 21:56:06 UTC (rev 58585)
@@ -136,7 +136,7 @@
}
}
-void view_idle()
+static void view_idle(void)
{
if(V.redraw) {
V.redraw = false;
Modified: branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_modifier.py 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/release/scripts/startup/bl_ui/properties_data_modifier.py 2013-07-24 21:56:06 UTC (rev 58585)
@@ -715,10 +715,12 @@
col = split.column()
col.label(text="Origin:")
col.prop(md, "origin", text="")
- sub = col.column()
- sub.active = (md.origin is not None)
- sub.prop(md, "use_relative")
+ if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
+ col.label(text="Lock:")
+ col.prop(md, "lock_x")
+ col.prop(md, "lock_y")
+
col = split.column()
col.label(text="Deform:")
if md.deform_method in {'TAPER', 'STRETCH'}:
@@ -726,9 +728,6 @@
else:
col.prop(md, "angle")
col.prop(md, "limits", slider=True)
- if md.deform_method in {'TAPER', 'STRETCH', 'TWIST'}:
- col.prop(md, "lock_x")
- col.prop(md, "lock_y")
def SMOKE(self, layout, ob, md):
layout.label(text="Settings can be found inside the Physics context")
Modified: branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_image.py 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_image.py 2013-07-24 21:56:06 UTC (rev 58585)
@@ -232,6 +232,7 @@
layout.operator("uv.snap_selected", text="Selected to Pixels").target = 'PIXELS'
layout.operator("uv.snap_selected", text="Selected to Cursor").target = 'CURSOR'
+ layout.operator("uv.snap_selected", text="Selected to Cursor (Offset)").target = 'CURSOR_OFFSET'
layout.operator("uv.snap_selected", text="Selected to Adjacent Unselected").target = 'ADJACENT_UNSELECTED'
layout.separator()
Modified: branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_sequencer.py 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_sequencer.py 2013-07-24 21:56:06 UTC (rev 58585)
@@ -671,13 +671,14 @@
layout.separator()
layout.prop(strip, "filepath", text="")
- row = layout.row()
- if sound.packed_file:
- row.operator("sound.unpack", icon='PACKAGE', text="Unpack")
- else:
- row.operator("sound.pack", icon='UGLYPACKAGE', text="Pack")
+ if sound is not None:
+ row = layout.row()
+ if sound.packed_file:
+ row.operator("sound.unpack", icon='PACKAGE', text="Unpack")
+ else:
+ row.operator("sound.pack", icon='UGLYPACKAGE', text="Pack")
- row.prop(sound, "use_memory_cache")
+ row.prop(sound, "use_memory_cache")
layout.prop(strip, "show_waveform")
layout.prop(strip, "volume")
Modified: branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d.py 2013-07-24 21:56:06 UTC (rev 58585)
@@ -293,7 +293,10 @@
layout = self.layout
layout.operator("view3d.snap_selected_to_grid", text="Selection to Grid")
- layout.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor")
+ props = layout.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor")
+ props.use_offset = False
+ props = layout.operator("view3d.snap_selected_to_cursor", text="Selection to Cursor (Offset)")
+ props.use_offset = True
layout.separator()
@@ -2194,7 +2197,9 @@
layout.operator("curve.spline_weight_set")
layout.operator("curve.radius_set")
layout.operator("curve.smooth")
+ layout.operator("curve.smooth_weight")
layout.operator("curve.smooth_radius")
+ layout.operator("curve.smooth_tilt")
class VIEW3D_MT_edit_curve_showhide(ShowHideMenu, Menu):
Modified: branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-24 21:56:06 UTC (rev 58585)
@@ -277,7 +277,6 @@
col.operator("curve.switch_direction")
col.operator("curve.spline_type_set")
col.operator("curve.radius_set")
- col.operator("curve.smooth_radius")
col = layout.column(align=True)
col.label(text="Handles:")
Modified: branches/soc-2013-dingto/source/blender/avi/intern/avi_options.c
===================================================================
--- branches/soc-2013-dingto/source/blender/avi/intern/avi_options.c 2013-07-24 21:25:06 UTC (rev 58584)
+++ branches/soc-2013-dingto/source/blender/avi/intern/avi_options.c 2013-07-24 21:56:06 UTC (rev 58585)
@@ -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-dingto/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/soc-2013-dingto/source/blender/blenkernel/BKE_DerivedMesh.h 2013-07-24 21:25:06 UTC (rev 58584)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list