[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50038] branches/soc-2011-tomato: svn merge ^/trunk/blender -r50023:50036
Campbell Barton
ideasman42 at gmail.com
Mon Aug 20 12:16:23 CEST 2012
Revision: 50038
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50038
Author: campbellbarton
Date: 2012-08-20 10:16:22 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r50023:50036
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50023
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/release/scripts/modules/console_python.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/SConscript
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-tomato/source/blender/python/intern/bpy.c
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_modifier.c
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50023
+ /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/vgroup_modifiers:38694-39989
/trunk/blender:36831-50036
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-08-20 10:15:32 UTC (rev 50037)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-08-20 10:16:22 UTC (rev 50038)
@@ -133,6 +133,7 @@
option(WITH_PLAYER "Build Player" OFF)
option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ON)
option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
+option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON)
# GHOST Windowing Library Options
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
@@ -1839,6 +1840,7 @@
info_cfg_option(WITH_GAMEENGINE)
info_cfg_option(WITH_PLAYER)
info_cfg_option(WITH_BULLET)
+ info_cfg_option(WITH_IK_SOLVER)
info_cfg_option(WITH_IK_ITASC)
info_cfg_option(WITH_OPENCOLLADA)
info_cfg_option(WITH_FFTW3)
Modified: branches/soc-2011-tomato/release/scripts/modules/console_python.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/modules/console_python.py 2012-08-20 10:15:32 UTC (rev 50037)
+++ branches/soc-2011-tomato/release/scripts/modules/console_python.py 2012-08-20 10:16:22 UTC (rev 50038)
@@ -290,6 +290,40 @@
return {'FINISHED'}
+def copy_as_script(context):
+ sc = context.space_data
+ lines = [
+ "import bpy",
+ "import bpy.context as C",
+ "import bpy.data as D",
+ "from mathutils import *",
+ "from math import *",
+ "",
+ ]
+
+ for line in sc.scrollback:
+ text = line.body
+ type = line.type
+
+ if type == 'INFO': # ignore autocomp.
+ continue
+ if type == 'INPUT':
+ if text.startswith(PROMPT):
+ text = text[len(PROMPT):]
+ elif text.startswith(PROMPT_MULTI):
+ text = text[len(PROMPT_MULTI):]
+ elif type == 'OUTPUT':
+ text = "#~ " + text
+ elif type == 'ERROR':
+ text = "#! " + text
+
+ lines.append(text)
+
+ context.window_manager.clipboard = "\n".join(lines)
+
+ return {'FINISHED'}
+
+
def banner(context):
sc = context.space_data
version_string = sys.version.strip().replace('\n', ' ')
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py 2012-08-20 10:15:32 UTC (rev 50037)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py 2012-08-20 10:16:22 UTC (rev 50038)
@@ -67,6 +67,25 @@
return {'FINISHED'}
+class ConsoleCopyAsScript(Operator):
+ """Copy the console contents for use in a script"""
+ bl_idname = "console.copy_as_script"
+ bl_label = "Copy to Clipboard (as script)"
+
+ def execute(self, context):
+ sc = context.space_data
+
+ module = _lang_module_get(sc)
+ copy_as_script = getattr(module, "copy_as_script", None)
+
+ if copy_as_script:
+ return copy_as_script(context)
+ else:
+ print("Error: copy_as_script - not found for %r" %
+ sc.language)
+ return {'FINISHED'}
+
+
class ConsoleBanner(Operator):
"""Print a message when the terminal initializes"""
bl_idname = "console.banner"
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py 2012-08-20 10:15:32 UTC (rev 50037)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py 2012-08-20 10:16:22 UTC (rev 50038)
@@ -51,6 +51,7 @@
layout.separator()
+ layout.operator("console.copy_as_script")
layout.operator("console.copy")
layout.operator("console.paste")
layout.menu("CONSOLE_MT_language")
Property changes on: branches/soc-2011-tomato/source/blender/blenkernel/intern/seqmodifier.c
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50023
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c: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/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50036
Modified: branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c 2012-08-20 10:15:32 UTC (rev 50037)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c 2012-08-20 10:16:22 UTC (rev 50038)
@@ -2042,22 +2042,38 @@
Object *obedit = CTX_data_edit_object(C);
BMEditMesh *em = BMEdit_FromObject(obedit);
BMOperator bmop;
+ const float mergedist = RNA_float_get(op->ptr, "mergedist");
+ int use_unselected = RNA_boolean_get(op->ptr, "use_unselected");
+ int totvert_orig = em->bm->totvert;
int count;
- EDBM_op_init(em, &bmop, op, "find_doubles verts=%hv dist=%f", BM_ELEM_SELECT, RNA_float_get(op->ptr, "mergedist"));
- BMO_op_exec(em->bm, &bmop);
+ if (use_unselected) {
+ EDBM_op_init(em, &bmop, op,
+ "automerge verts=%hv dist=%f",
+ BM_ELEM_SELECT, mergedist);
+ BMO_op_exec(em->bm, &bmop);
- count = BMO_slot_map_count(em->bm, &bmop, "targetmapout");
-
- if (!EDBM_op_callf(em, op, "weld_verts targetmap=%s", &bmop, "targetmapout")) {
- BMO_op_finish(em->bm, &bmop);
- return OPERATOR_CANCELLED;
+ if (!EDBM_op_finish(em, &bmop, op, TRUE)) {
+ return OPERATOR_CANCELLED;
+ }
}
+ else {
+ EDBM_op_init(em, &bmop, op,
+ "find_doubles verts=%hv dist=%f",
+ BM_ELEM_SELECT, mergedist);
+ BMO_op_exec(em->bm, &bmop);
- if (!EDBM_op_finish(em, &bmop, op, TRUE)) {
- return OPERATOR_CANCELLED;
+ if (!EDBM_op_callf(em, op, "weld_verts targetmap=%s", &bmop, "targetmapout")) {
+ BMO_op_finish(em->bm, &bmop);
+ return OPERATOR_CANCELLED;
+ }
+
+ if (!EDBM_op_finish(em, &bmop, op, TRUE)) {
+ return OPERATOR_CANCELLED;
+ }
}
+ count = totvert_orig - em->bm->totvert;
BKE_reportf(op->reports, RPT_INFO, "Removed %d vert%s", count, (count == 1) ? "ex" : "ices");
EDBM_update_generic(C, em, TRUE);
@@ -2082,6 +2098,7 @@
RNA_def_float(ot->srna, "mergedist", 0.0001f, 0.000001f, 50.0f,
"Merge Distance",
"Minimum distance between elements to merge", 0.00001, 10.0);
+ RNA_def_boolean(ot->srna, "use_unselected", 1, "Unselected", "Merge selected to other unselected vertices");
}
/************************ Vertex Path Operator *************************/
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c 2012-08-20 10:15:32 UTC (rev 50037)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c 2012-08-20 10:16:22 UTC (rev 50038)
@@ -1462,7 +1462,8 @@
me->totvert);
/* Mark an arbitrary vertex as root */
- vs->flag |= MVERT_SKIN_ROOT;
+ if (vs)
+ vs->flag |= MVERT_SKIN_ROOT;
}
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c 2012-08-20 10:15:32 UTC (rev 50037)
+++ branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c 2012-08-20 10:16:22 UTC (rev 50038)
@@ -326,6 +326,7 @@
WM_keymap_add_item(keymap, "CONSOLE_OT_autocomplete", SPACEKEY, KM_PRESS, KM_CTRL, 0); /* python operator - space_text.py */
#endif
+ WM_keymap_add_item(keymap, "CONSOLE_OT_copy_as_script", CKEY, KM_PRESS, KM_CTRL | KM_SHIFT, 0);
WM_keymap_add_item(keymap, "CONSOLE_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "CONSOLE_OT_paste", VKEY, KM_PRESS, KM_CTRL, 0);
#ifdef __APPLE__
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list