[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58707] branches/soc-2013-bge: Merged revisions 58516-58705 from trunk/blender
Daniel Stokes
kupomail at gmail.com
Mon Jul 29 06:52:42 CEST 2013
Revision: 58707
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58707
Author: kupoman
Date: 2013-07-29 04:52:41 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Merged revisions 58516-58705 from trunk/blender
Modified Paths:
--------------
branches/soc-2013-bge/intern/cycles/kernel/kernel_random.h
branches/soc-2013-bge/release/datafiles/splash.png
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-bge/source/blender/avi/intern/avi.c
branches/soc-2013-bge/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_context.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_global.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-bge/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-bge/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-bge/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/anim.c
branches/soc-2013-bge/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-bge/source/blender/blenkernel/intern/camera.c
branches/soc-2013-bge/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/context.c
branches/soc-2013-bge/source/blender/blenkernel/intern/curve.c
branches/soc-2013-bge/source/blender/blenkernel/intern/deform.c
branches/soc-2013-bge/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/mask.c
branches/soc-2013-bge/source/blender/blenkernel/intern/material.c
branches/soc-2013-bge/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-bge/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-bge/source/blender/blenkernel/intern/multires.c
branches/soc-2013-bge/source/blender/blenkernel/intern/object.c
branches/soc-2013-bge/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-bge/source/blender/blenkernel/intern/pbvh_intern.h
branches/soc-2013-bge/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-bge/source/blender/blenkernel/intern/property.c
branches/soc-2013-bge/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-bge/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-bge/source/blender/blenkernel/intern/text.c
branches/soc-2013-bge/source/blender/blenkernel/intern/texture.c
branches/soc-2013-bge/source/blender/blenlib/BLI_array.h
branches/soc-2013-bge/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-bge/source/blender/blenlib/BLI_buffer.h
branches/soc-2013-bge/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-bge/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-bge/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-bge/source/blender/blenlib/BLI_string.h
branches/soc-2013-bge/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-bge/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-bge/source/blender/blenlib/intern/fileops.c
branches/soc-2013-bge/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-bge/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-bge/source/blender/blenlib/intern/path_util.c
branches/soc-2013-bge/source/blender/blenlib/intern/storage.c
branches/soc-2013-bge/source/blender/blenlib/intern/string.c
branches/soc-2013-bge/source/blender/blenlib/intern/string_utf8.c
branches/soc-2013-bge/source/blender/blenloader/intern/readfile.c
branches/soc-2013-bge/source/blender/blenloader/intern/writefile.c
branches/soc-2013-bge/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-bge/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-bge/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-bge/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-bge/source/blender/editors/animation/anim_intern.h
branches/soc-2013-bge/source/blender/editors/animation/anim_markers.c
branches/soc-2013-bge/source/blender/editors/animation/keyframes_general.c
branches/soc-2013-bge/source/blender/editors/armature/armature_edit.c
branches/soc-2013-bge/source/blender/editors/armature/armature_relations.c
branches/soc-2013-bge/source/blender/editors/armature/armature_select.c
branches/soc-2013-bge/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-bge/source/blender/editors/armature/armature_utils.c
branches/soc-2013-bge/source/blender/editors/armature/pose_select.c
branches/soc-2013-bge/source/blender/editors/armature/pose_utils.c
branches/soc-2013-bge/source/blender/editors/curve/curve_intern.h
branches/soc-2013-bge/source/blender/editors/curve/curve_ops.c
branches/soc-2013-bge/source/blender/editors/curve/editcurve.c
branches/soc-2013-bge/source/blender/editors/curve/editfont.c
branches/soc-2013-bge/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-bge/source/blender/editors/include/ED_armature.h
branches/soc-2013-bge/source/blender/editors/include/UI_interface.h
branches/soc-2013-bge/source/blender/editors/interface/interface.c
branches/soc-2013-bge/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-bge/source/blender/editors/interface/interface_intern.h
branches/soc-2013-bge/source/blender/editors/interface/interface_ops.c
branches/soc-2013-bge/source/blender/editors/interface/interface_regions.c
branches/soc-2013-bge/source/blender/editors/mesh/editface.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-bge/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-bge/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-bge/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-bge/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-bge/source/blender/editors/mesh/meshtools.c
branches/soc-2013-bge/source/blender/editors/object/object_add.c
branches/soc-2013-bge/source/blender/editors/object/object_edit.c
branches/soc-2013-bge/source/blender/editors/object/object_lattice.c
branches/soc-2013-bge/source/blender/editors/object/object_modifier.c
branches/soc-2013-bge/source/blender/editors/object/object_relations.c
branches/soc-2013-bge/source/blender/editors/render/render_opengl.c
branches/soc-2013-bge/source/blender/editors/render/render_shading.c
branches/soc-2013-bge/source/blender/editors/screen/area.c
branches/soc-2013-bge/source/blender/editors/screen/screen_ops.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/paint_vertex_proj.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-bge/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2013-bge/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2013-bge/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-bge/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-bge/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-bge/source/blender/editors/space_image/image_buttons.c
branches/soc-2013-bge/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2013-bge/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-bge/source/blender/editors/space_node/node_add.c
branches/soc-2013-bge/source/blender/editors/space_node/node_buttons.c
branches/soc-2013-bge/source/blender/editors/space_node/node_relationships.c
branches/soc-2013-bge/source/blender/editors/space_node/node_toolbar.c
branches/soc-2013-bge/source/blender/editors/space_node/node_view.c
branches/soc-2013-bge/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-bge/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2013-bge/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-bge/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-bge/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-bge/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-bge/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2013-bge/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-bge/source/blender/editors/transform/transform.c
branches/soc-2013-bge/source/blender/editors/transform/transform.h
branches/soc-2013-bge/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-bge/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-bge/source/blender/editors/util/crazyspace.c
branches/soc-2013-bge/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-bge/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-bge/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-bge/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-bge/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-bge/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-bge/source/blender/imbuf/intern/indexer.c
branches/soc-2013-bge/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-bge/source/blender/imbuf/intern/util.c
branches/soc-2013-bge/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-bge/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-bge/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-bge/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-bge/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-bge/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2013-bge/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2013-bge/source/blender/render/intern/source/external_engine.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-bge/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-bge/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-bge/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-bge/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-bge/source/gameengine/Expressions/FloatValue.cpp
branches/soc-2013-bge/source/gameengine/Expressions/IntValue.cpp
branches/soc-2013-bge/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-bge/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-bge/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2013-bge/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Added Paths:
-----------
branches/soc-2013-bge/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-bge/source/blender/bmesh/operators/bmo_fill_holes.c
Removed Paths:
-------------
branches/soc-2013-bge/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2013-bge/source/blender/bmesh/tools/BME_bevel.c
Property Changed:
----------------
branches/soc-2013-bge/
branches/soc-2013-bge/source/blender/editors/interface/interface.c
branches/soc-2013-bge/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-bge
___________________________________________________________________
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:57538-58515
+ /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:57538-58705
Modified: branches/soc-2013-bge/intern/cycles/kernel/kernel_random.h
===================================================================
--- branches/soc-2013-bge/intern/cycles/kernel/kernel_random.h 2013-07-29 04:45:40 UTC (rev 58706)
+++ branches/soc-2013-bge/intern/cycles/kernel/kernel_random.h 2013-07-29 04:52:41 UTC (rev 58707)
@@ -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-bge/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_data_modifier.py 2013-07-29 04:45:40 UTC (rev 58706)
+++ branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_data_modifier.py 2013-07-29 04:52:41 UTC (rev 58707)
@@ -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-bge/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_object.py 2013-07-29 04:45:40 UTC (rev 58706)
+++ branches/soc-2013-bge/release/scripts/startup/bl_ui/properties_object.py 2013-07-29 04:52:41 UTC (rev 58707)
@@ -243,10 +243,20 @@
layout = self.layout
obj = context.object
+ obj_type = obj.type
+ is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'})
+ is_empty_image = (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE')
split = layout.split()
+
col = split.column()
- col.prop(obj, "draw_type", text="Type")
+ col.prop(obj, "show_name", text="Name")
+ col.prop(obj, "show_axis", text="Axis")
+ if is_geometry:
+ # Makes no sense for cameras, armatures, etc.!
+ col.prop(obj, "show_wire", text="Wire")
+ if obj_type == 'MESH':
+ col.prop(obj, "show_all_edges")
col = split.column()
row = col.row()
@@ -255,29 +265,26 @@
sub.active = obj.show_bounds
sub.prop(obj, "draw_bounds_type", text="")
+ if is_geometry:
+ col.prop(obj, "show_texture_space", text="Texture Space")
+ col.prop(obj, "show_x_ray", text="X-Ray")
+ if obj_type == 'MESH' or is_empty_image:
+ col.prop(obj, "show_transparent", text="Transparency")
+
split = layout.split()
col = split.column()
- col.prop(obj, "show_name", text="Name")
- col.prop(obj, "show_axis", text="Axis")
+ if obj_type not in {'CAMERA', 'EMPTY'}:
+ col.label(text="Maximum draw type:")
+ col.prop(obj, "draw_type", text="")
- obj_type = obj.type
-
- if obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}:
- # Makes no sense for cameras, armtures, etc.!
- col.prop(obj, "show_wire", text="Wire")
+ col = split.column()
+ if is_geometry or is_empty_image:
# Only useful with object having faces/materials...
- col.prop(obj, "color", text="Object Color")
+ col.label(text="Object Color:")
+ col.prop(obj, "color", text="")
- col = split.column()
- col.prop(obj, "show_texture_space", text="Texture Space")
- col.prop(obj, "show_x_ray", text="X-Ray")
- if obj_type == 'MESH' or (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE'):
- col.prop(obj, "show_transparent", text="Transparency")
- if obj_type == 'MESH':
- col.prop(obj, "show_all_edges")
-
class OBJECT_PT_duplication(ObjectButtonsPanel, Panel):
bl_label = "Duplication"
Modified: branches/soc-2013-bge/release/scripts/startup/bl_ui/space_sequencer.py
===================================================================
--- branches/soc-2013-bge/release/scripts/startup/bl_ui/space_sequencer.py 2013-07-29 04:45:40 UTC (rev 58706)
+++ branches/soc-2013-bge/release/scripts/startup/bl_ui/space_sequencer.py 2013-07-29 04:52:41 UTC (rev 58707)
@@ -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-bge/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d.py 2013-07-29 04:45:40 UTC (rev 58706)
+++ branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d.py 2013-07-29 04:52:41 UTC (rev 58707)
@@ -1822,6 +1822,7 @@
layout.menu("VIEW3D_MT_edit_mesh_edges")
layout.menu("VIEW3D_MT_edit_mesh_faces")
layout.menu("VIEW3D_MT_edit_mesh_normals")
+ layout.menu("VIEW3D_MT_edit_mesh_clean")
layout.separator()
@@ -2084,6 +2085,16 @@
layout.operator("mesh.flip_normals")
+class VIEW3D_MT_edit_mesh_clean(Menu):
+ bl_label = "Clean"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("mesh.fill_holes")
+ layout.operator("mesh.vert_connect_nonplanar")
+
+
class VIEW3D_MT_edit_mesh_delete(Menu):
bl_label = "Delete"
@@ -2197,7 +2208,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-bge/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-29 04:45:40 UTC (rev 58706)
+++ branches/soc-2013-bge/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-29 04:52:41 UTC (rev 58707)
@@ -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-bge/source/blender/avi/intern/avi.c
===================================================================
--- branches/soc-2013-bge/source/blender/avi/intern/avi.c 2013-07-29 04:45:40 UTC (rev 58706)
+++ branches/soc-2013-bge/source/blender/avi/intern/avi.c 2013-07-29 04:52:41 UTC (rev 58707)
@@ -811,12 +811,16 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list