[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58708] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Mon Jul 29 07:16:16 CEST 2013
Revision: 58708
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58708
Author: gdh
Date: 2013-07-29 05:16:16 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58681 to r58705.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58681
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58705
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_array.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_markers.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/armature_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/pose_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/armature/pose_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_relations.c
branches/soc-2013-cycles_mblur/source/blender/editors/render/render_shading.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_image/image_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_relationships.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_toolbar.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_view.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_mblur/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2013-cycles_mblur/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_mblur/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
Added Paths:
-----------
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_connect_nonplanar.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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:57388-58680
+ /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:57388-58705
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_object.py 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_object.py 2013-07-29 05:16:16 UTC (rev 58708)
@@ -205,10 +205,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()
@@ -217,29 +227,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-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-29 05:16:16 UTC (rev 58708)
@@ -2092,6 +2092,7 @@
layout = self.layout
layout.operator("mesh.fill_holes")
+ layout.operator("mesh.vert_connect_nonplanar")
class VIEW3D_MT_edit_mesh_delete(Menu):
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-29 05:16:16 UTC (rev 58708)
@@ -46,7 +46,6 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_memarena.h"
-#include "BLI_array.h"
#include "BLI_utildefines.h"
#include "BLI_linklist.h"
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/anim_sys.c 2013-07-29 05:16:16 UTC (rev 58708)
@@ -39,8 +39,8 @@
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
-#include "BLI_array.h"
#include "BLI_blenlib.h"
+#include "BLI_alloca.h"
#include "BLI_dynstr.h"
#include "BLF_translation.h"
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cdderivedmesh.c 2013-07-29 05:16:16 UTC (rev 58708)
@@ -40,7 +40,6 @@
#include "BLI_blenlib.h"
#include "BLI_edgehash.h"
#include "BLI_math.h"
-#include "BLI_array.h"
#include "BLI_smallhash.h"
#include "BLI_utildefines.h"
#include "BLI_scanfill.h"
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/material.c 2013-07-29 05:16:16 UTC (rev 58708)
@@ -1176,7 +1176,9 @@
totcolp = give_totcolp(ob);
matarar = give_matarar(ob);
- if (*matarar == NULL) return FALSE;
+ if (ELEM(NULL, matarar, *matarar)) {
+ return false;
+ }
/* can happen on face selection in editmode */
if (ob->actcol > ob->totcol) {
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c 2013-07-29 05:16:16 UTC (rev 58708)
@@ -51,6 +51,7 @@
#include "BLI_bitmap.h"
#include "BLI_scanfill.h"
#include "BLI_array.h"
+#include "BLI_alloca.h"
#include "BKE_animsys.h"
#include "BKE_main.h"
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifiers_bmesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-07-29 04:52:41 UTC (rev 58707)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/modifiers_bmesh.c 2013-07-29 05:16:16 UTC (rev 58708)
@@ -28,13 +28,13 @@
* \ingroup bke
*/
+#include "MEM_guardedalloc.h"
+
#include "BLI_math.h"
+#include "BLI_alloca.h"
-#include "MEM_guardedalloc.h"
-
#include "DNA_object_types.h"
-#include "BLI_array.h"
#include "BKE_DerivedMesh.h"
#include "BKE_editmesh.h"
Copied: branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_alloca.h (from rev 58705, trunk/blender/source/blender/blenlib/BLI_alloca.h)
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_alloca.h (rev 0)
+++ branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_alloca.h 2013-07-29 05:16:16 UTC (rev 58708)
@@ -0,0 +1,46 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef __BLI_ALLOCA_H__
+
+/** \file BLI_alloca.h
+ * \ingroup bli
+ *
+ * Defines alloca and utility macro BLI_array_alloca
+ */
+
+/* BLI_array_alloca / alloca */
+#ifdef _MSC_VER
+# define alloca _alloca
+#endif
+
+#if defined(__MINGW32__)
+# include <malloc.h> /* mingw needs for alloca() */
+#endif
+
+#if defined(__GNUC__) || defined(__clang__)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list