[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58510] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Mon Jul 22 21:08:12 CEST 2013
Revision: 58510
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58510
Author: gdh
Date: 2013-07-22 19:08:11 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
Merged trunk into branch. Includes r58443 to r58509.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58443
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58509
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_test.cpp
branches/soc-2013-cycles_mblur/intern/cycles/util/util_task.cpp
branches/soc-2013-cycles_mblur/intern/cycles/util/util_view.cpp
branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_options.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_text.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/armature.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/cloth.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/editmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/image.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/library.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/object.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/packedFile.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/paint.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/text.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_color.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/noise.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/path_util.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/string.c
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_polygon.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_normals.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2013-cycles_mblur/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/anim_markers.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/keyframing.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/ED_mesh.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/resources.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_add.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_intern.h
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/mask/mask_select.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/meshtools.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_hook.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_lattice.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_relations.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-cycles_mblur/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_action/space_action.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_file/filelist.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_image/space_image.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_info/space_info.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_channels.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/space_text.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_time/space_time.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_generics.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-cycles_mblur/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-cycles_mblur/source/blender/editors/util/numinput.c
branches/soc-2013-cycles_mblur/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/cineon/logImageCore.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-cycles_mblur/source/blender/imbuf/intern/png.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-cycles_mblur/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2013-cycles_mblur/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna.c
branches/soc-2013-cycles_mblur/source/blender/python/intern/bpy_rna_array.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-cycles_mblur/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-cycles_mblur/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_mblur/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-cycles_mblur/source/creator/creator.c
branches/soc-2013-cycles_mblur/source/gameengine/Ketsji/KX_PythonSeq.cpp
branches/soc-2013-cycles_mblur/source/tools/check_style_c.py
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
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-58442
+ /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-58509
Modified: branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_test.cpp 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/intern/cycles/app/cycles_test.cpp 2013-07-22 19:08:11 UTC (rev 58510)
@@ -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-cycles_mblur/intern/cycles/util/util_task.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/util/util_task.cpp 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/intern/cycles/util/util_task.cpp 2013-07-22 19:08:11 UTC (rev 58510)
@@ -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-cycles_mblur/intern/cycles/util/util_view.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/util/util_view.cpp 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/intern/cycles/util/util_view.cpp 2013-07-22 19:08:11 UTC (rev 58510)
@@ -136,7 +136,7 @@
}
}
-void view_idle()
+static void view_idle(void)
{
if(V.redraw) {
V.redraw = false;
Modified: branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/final.py 2013-07-22 19:08:11 UTC (rev 58510)
@@ -3,8 +3,8 @@
cycles.squared_samples = True
-cycles.samples = 8
-cycles.preview_samples = 8
+cycles.samples = 24
+cycles.preview_samples = 24
cycles.aa_samples = 8
cycles.preview_aa_samples = 8
Modified: branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/release/scripts/presets/cycles/sampling/preview.py 2013-07-22 19:08:11 UTC (rev 58510)
@@ -3,8 +3,8 @@
cycles.squared_samples = True
-cycles.samples = 4
-cycles.preview_samples = 4
+cycles.samples = 12
+cycles.preview_samples = 12
cycles.aa_samples = 4
cycles.preview_aa_samples = 4
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_curve.py 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_data_curve.py 2013-07-22 19:08:11 UTC (rev 58510)
@@ -362,7 +362,7 @@
col = split.column(align=True)
col.label(text="Spacing:")
- col.prop(text, "space_character", text="Character")
+ col.prop(text, "space_character", text="Letter")
col.prop(text, "space_word", text="Word")
col.prop(text, "space_line", text="Line")
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_mask_common.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_mask_common.py 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/properties_mask_common.py 2013-07-22 19:08:11 UTC (rev 58510)
@@ -339,6 +339,11 @@
layout.separator()
+ layout.operator("mask.select_more")
+ layout.operator("mask.select_less")
+
+ layout.separator()
+
layout.operator("mask.select_all").action = 'TOGGLE'
layout.operator("mask.select_all", text="Inverse").action = 'INVERT'
Modified: branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_image.py 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_image.py 2013-07-22 19:08:11 UTC (rev 58510)
@@ -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-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-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/release/scripts/startup/bl_ui/space_view3d.py 2013-07-22 19:08:11 UTC (rev 58510)
@@ -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()
@@ -2540,7 +2543,7 @@
view = context.space_data
scene = context.scene
gs = scene.game_settings
- ob = context.object
+ obj = context.object
col = layout.column()
col.prop(view, "show_only_render")
@@ -2580,7 +2583,7 @@
if view.use_matcap:
col.template_icon_view(view, "matcap_icon")
col.prop(view, "show_backface_culling")
- if ob.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
+ if obj and obj.mode == 'EDIT' and view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'}:
col.prop(view, "show_occlude_wire")
layout.separator()
Modified: branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_options.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_options.c 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/source/blender/avi/intern/avi_options.c 2013-07-22 19:08:11 UTC (rev 58510)
@@ -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-cycles_mblur/source/blender/blenkernel/BKE_text.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_text.h 2013-07-22 18:19:02 UTC (rev 58509)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_text.h 2013-07-22 19:08:11 UTC (rev 58510)
@@ -86,7 +86,6 @@
void txt_sel_line (struct Text *text);
char *txt_sel_to_buf (struct Text *text);
void txt_insert_buf (struct Text *text, const char *in_buffer);
-void txt_print_undo (struct Text *text);
void txt_undo_add_op (struct Text *text, int op);
void txt_do_undo (struct Text *text);
void txt_do_redo (struct Text *text);
@@ -106,6 +105,10 @@
bool txt_cursor_is_line_start(struct Text *text);
bool txt_cursor_is_line_end(struct Text *text);
+#if 0
+void txt_print_undo (struct Text *text);
+#endif
+
/* utility functions, could be moved somewhere more generic but are python/text related */
int text_check_bracket(const char ch);
int text_check_delim(const char ch);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/armature.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list