[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58695] branches/soc-2013-paint: Merge trunk -r58694 into soc-2013-paint
Antony Riakiotakis
kalast at gmail.com
Sun Jul 28 17:07:13 CEST 2013
Revision: 58695
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58695
Author: psy-fi
Date: 2013-07-28 15:07:13 +0000 (Sun, 28 Jul 2013)
Log Message:
-----------
Merge trunk -r58694 into soc-2013-paint
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58694
Modified Paths:
--------------
branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-paint/source/blender/avi/intern/avi.c
branches/soc-2013-paint/source/blender/blenkernel/BKE_context.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-paint/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-paint/source/blender/blenkernel/intern/camera.c
branches/soc-2013-paint/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/context.c
branches/soc-2013-paint/source/blender/blenkernel/intern/curve.c
branches/soc-2013-paint/source/blender/blenkernel/intern/deform.c
branches/soc-2013-paint/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/material.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-paint/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/object.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-paint/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-paint/source/blender/blenkernel/intern/text.c
branches/soc-2013-paint/source/blender/blenlib/BLI_array.h
branches/soc-2013-paint/source/blender/blenlib/BLI_buffer.h
branches/soc-2013-paint/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-paint/source/blender/blenlib/BLI_path_util.h
branches/soc-2013-paint/source/blender/blenlib/BLI_string.h
branches/soc-2013-paint/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-paint/source/blender/blenlib/intern/fileops.c
branches/soc-2013-paint/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-paint/source/blender/blenlib/intern/path_util.c
branches/soc-2013-paint/source/blender/blenlib/intern/string.c
branches/soc-2013-paint/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_decimate.h
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-paint/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-paint/source/blender/editors/animation/anim_intern.h
branches/soc-2013-paint/source/blender/editors/animation/keyframes_general.c
branches/soc-2013-paint/source/blender/editors/armature/armature_edit.c
branches/soc-2013-paint/source/blender/editors/armature/armature_relations.c
branches/soc-2013-paint/source/blender/editors/armature/armature_utils.c
branches/soc-2013-paint/source/blender/editors/armature/pose_utils.c
branches/soc-2013-paint/source/blender/editors/curve/curve_intern.h
branches/soc-2013-paint/source/blender/editors/curve/curve_ops.c
branches/soc-2013-paint/source/blender/editors/curve/editcurve.c
branches/soc-2013-paint/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-paint/source/blender/editors/include/ED_armature.h
branches/soc-2013-paint/source/blender/editors/include/UI_interface.h
branches/soc-2013-paint/source/blender/editors/interface/interface.c
branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-paint/source/blender/editors/interface/interface_intern.h
branches/soc-2013-paint/source/blender/editors/interface/interface_ops.c
branches/soc-2013-paint/source/blender/editors/interface/interface_regions.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_add.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-paint/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-paint/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-paint/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-paint/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-paint/source/blender/editors/object/object_add.c
branches/soc-2013-paint/source/blender/editors/object/object_relations.c
branches/soc-2013-paint/source/blender/editors/screen/area.c
branches/soc-2013-paint/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-paint/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-paint/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-paint/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-paint/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-paint/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-paint/source/blender/editors/transform/transform.c
branches/soc-2013-paint/source/blender/editors/transform/transform.h
branches/soc-2013-paint/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-paint/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-paint/source/blender/imbuf/intern/indexer.c
branches/soc-2013-paint/source/blender/imbuf/intern/thumbs.c
branches/soc-2013-paint/source/blender/imbuf/intern/util.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_color.c
branches/soc-2013-paint/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2013-paint/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-paint/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2013-paint/source/blender/render/intern/source/external_engine.c
branches/soc-2013-paint/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-paint/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-paint/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
Added Paths:
-----------
branches/soc-2013-paint/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_holes.c
Modified: branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_object.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_object.py 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/properties_object.py 2013-07-28 15:07:13 UTC (rev 58695)
@@ -203,43 +203,56 @@
def draw(self, context):
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')
+ # start top half
split = layout.split()
+
+ # left column checkboxes
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, armtures, etc.!
+ col.prop(obj, "show_wire", text="Wire")
+ if obj_type == 'MESH':
+ col.prop(obj, "show_all_edges")
+ # right column checkboxes
col = split.column()
- row = col.row()
- row.prop(obj, "show_bounds", text="Bounds")
- sub = row.row()
- sub.active = obj.show_bounds
+ if 1: # for code nesting clarity
+ row = col.row()
+ row.prop(obj, "show_bounds", text="Bounds")
+ sub = row.row()
+ 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")
+
+ # start bottom half
split = layout.split()
+ # left
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")
+ # right
+ 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-paint/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py 2013-07-28 15:07:13 UTC (rev 58695)
@@ -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,15 @@
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")
+
+
class VIEW3D_MT_edit_mesh_delete(Menu):
bl_label = "Delete"
@@ -2197,7 +2207,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-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2013-07-28 15:07:13 UTC (rev 58695)
@@ -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-paint/source/blender/avi/intern/avi.c
===================================================================
--- branches/soc-2013-paint/source/blender/avi/intern/avi.c 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/source/blender/avi/intern/avi.c 2013-07-28 15:07:13 UTC (rev 58695)
@@ -811,12 +811,16 @@
movie->streams[i].sh.fcc = FCC("strh");
movie->streams[i].sh.size = 56;
movie->streams[i].sh.Type = avi_get_format_type(movie->streams[i].format);
- if (movie->streams[i].sh.Type == 0)
+ if (movie->streams[i].sh.Type == 0) {
+ va_end(ap);
return AVI_ERROR_FORMAT;
+ }
movie->streams[i].sh.Handler = avi_get_format_fcc(movie->streams[i].format);
- if (movie->streams[i].sh.Handler == 0)
+ if (movie->streams[i].sh.Handler == 0) {
+ va_end(ap);
return AVI_ERROR_FORMAT;
+ }
movie->streams[i].sh.Flags = 0;
movie->streams[i].sh.Priority = 0;
@@ -950,6 +954,8 @@
PUT_FCCN((header_pos2 - header_pos1 + 4L), movie->fp);
+ va_end(ap);
+
return AVI_ERROR_NONE;
}
Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_context.h 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_context.h 2013-07-28 15:07:13 UTC (rev 58695)
@@ -200,8 +200,8 @@
void CTX_data_type_set(struct bContextDataResult *result, short type);
short CTX_data_type_get(struct bContextDataResult *result);
-int CTX_data_equals(const char *member, const char *str);
-int CTX_data_dir(const char *member);
+bool CTX_data_equals(const char *member, const char *str);
+bool CTX_data_dir(const char *member);
#if 0
void CTX_data_pointer_set(bContextDataResult *result, void *data);
Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_curve.h 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_curve.h 2013-07-28 15:07:13 UTC (rev 58695)
@@ -129,6 +129,14 @@
void BKE_nurb_points_add(struct Nurb *nu, int number);
void BKE_nurb_bezierPoints_add(struct Nurb *nu, int number);
+struct BezTriple *BKE_nurb_bezt_get_next(struct Nurb *nu, struct BezTriple *bezt);
+struct BezTriple *BKE_nurb_bezt_get_prev(struct Nurb *nu, struct BezTriple *bezt);
+struct BPoint *BKE_nurb_bpoint_get_next(struct Nurb *nu, struct BPoint *bp);
+struct BPoint *BKE_nurb_bpoint_get_prev(struct Nurb *nu, struct BPoint *bp);
+
+void BKE_nurb_bezt_calc_normal(struct Nurb *nu, struct BezTriple *bezt, float r_normal[3]);
+void BKE_nurb_bezt_calc_plane(struct Nurb *nu, struct BezTriple *bezt, float r_plane[3]);
+
void BKE_nurb_handle_calc(struct BezTriple *bezt, struct BezTriple *prev, struct BezTriple *next, int mode);
void BKE_nurb_handles_calc(struct Nurb *nu);
Modified: branches/soc-2013-paint/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/BKE_sequencer.h 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/source/blender/blenkernel/BKE_sequencer.h 2013-07-28 15:07:13 UTC (rev 58695)
@@ -265,7 +265,7 @@
/* **********************************************************************
* seqeffects.c
*
- * Sequencer effect strip managment functions
+ * Sequencer effect strip management functions
* **********************************************************************
*/
Modified: branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/DerivedMesh.c 2013-07-28 15:07:13 UTC (rev 58695)
@@ -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-paint/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/anim_sys.c 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/anim_sys.c 2013-07-28 15:07:13 UTC (rev 58695)
@@ -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-paint/source/blender/blenkernel/intern/camera.c
===================================================================
--- branches/soc-2013-paint/source/blender/blenkernel/intern/camera.c 2013-07-28 12:17:00 UTC (rev 58694)
+++ branches/soc-2013-paint/source/blender/blenkernel/intern/camera.c 2013-07-28 15:07:13 UTC (rev 58695)
@@ -408,26 +408,33 @@
}
else {
/* that way it's always visible - clipsta+0.1 */
- float fac;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list