[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59579] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Wed Aug 28 01:31:43 CEST 2013
Revision: 59579
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59579
Author: gdh
Date: 2013-08-27 23:31:43 +0000 (Tue, 27 Aug 2013)
Log Message:
-----------
Merged trunk into branch. Includes r59549 to r59577.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59549
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59577
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/GNUmakefile
branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.sh
branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg
branches/soc-2013-cycles_mblur/release/datafiles/blender_icons16.png
branches/soc-2013-cycles_mblur/release/datafiles/blender_icons32.png
branches/soc-2013-cycles_mblur/release/datafiles/prvicons.sh
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/screen.c
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/treehash.c
branches/soc-2013-cycles_mblur/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2013-cycles_mblur/source/blender/blenlib/intern/path_util.c
branches/soc-2013-cycles_mblur/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operator_api_inline.h
branches/soc-2013-cycles_mblur/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-cycles_mblur/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_icons.h
branches/soc-2013-cycles_mblur/source/blender/editors/include/UI_interface.h
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_layout.c
branches/soc-2013-cycles_mblur/source/blender/editors/interface/interface_templates.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_file/filesel.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_node/node_buttons.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-cycles_mblur/source/blender/makesdna/DNA_screen_types.h
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2013-cycles_mblur/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59548
+ /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,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-59577
Modified: branches/soc-2013-cycles_mblur/GNUmakefile
===================================================================
--- branches/soc-2013-cycles_mblur/GNUmakefile 2013-08-27 23:23:19 UTC (rev 59578)
+++ branches/soc-2013-cycles_mblur/GNUmakefile 2013-08-27 23:31:43 UTC (rev 59579)
@@ -184,6 +184,7 @@
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
@echo "Utilities (not associated with building blender)"
+ @echo " * icons - updates PNG icons from SVG files."
@echo " * tbz - create a compressed svn export 'blender_archive.tar.bz2'"
@echo ""
@echo "Documentation Targets (not associated with building blender)"
@@ -322,7 +323,11 @@
rm -rf blender_archive/
@echo "blender_archive.tar.bz2 written"
+icons:
+ $(BLENDER_DIR)/release/datafiles/blender_icons.sh
+ $(BLENDER_DIR)/release/datafiles/prvicons.sh
+
# -----------------------------------------------------------------------------
# Documentation
#
Modified: branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.sh
===================================================================
--- branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.sh 2013-08-27 23:23:19 UTC (rev 59578)
+++ branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.sh 2013-08-27 23:31:43 UTC (rev 59579)
@@ -1,5 +1,8 @@
#!/bin/sh
# This script updates icons from the SVG file
-inkscape blender_icons.svg --export-dpi=90 --without-gui --export-png=blender_icons16.png
-inkscape blender_icons.svg --export-dpi=180 --without-gui --export-png=blender_icons32.png
+BASEDIR=$(dirname $0)
+
+inkscape $BASEDIR/blender_icons.svg --export-dpi=90 --without-gui --export-png=$BASEDIR/blender_icons16.png
+inkscape $BASEDIR/blender_icons.svg --export-dpi=180 --without-gui --export-png=$BASEDIR/blender_icons32.png
+
Modified: branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg
===================================================================
--- branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg 2013-08-27 23:23:19 UTC (rev 59578)
+++ branches/soc-2013-cycles_mblur/release/datafiles/blender_icons.svg 2013-08-27 23:31:43 UTC (rev 59579)
@@ -14,7 +14,7 @@
height="640"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.48.2 r9819"
+ inkscape:version="0.48.4 r9939"
version="1.0"
sodipodi:docname="blender_icons.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -27061,16 +27061,16 @@
objecttolerance="10000"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="4"
- inkscape:cx="208.64962"
- inkscape:cy="493.26154"
+ inkscape:zoom="8"
+ inkscape:cx="336.81018"
+ inkscape:cy="34.425847"
inkscape:document-units="px"
- inkscape:current-layer="layer1"
+ inkscape:current-layer="g24559-2"
showgrid="false"
- inkscape:window-width="1360"
- inkscape:window-height="684"
+ inkscape:window-width="1366"
+ inkscape:window-height="695"
inkscape:window-x="0"
- inkscape:window-y="31"
+ inkscape:window-y="24"
inkscape:snap-nodes="false"
inkscape:snap-bbox="true"
showguides="true"
@@ -35233,7 +35233,7 @@
id="path14745" />
<path
transform="matrix(3.625,0,0,3.1690202,-67.8125,318.31703)"
- d="m 14.5,57.5 a 1,1.0000004 0 1 1 -2,0 1,1.0000004 0 1 1 2,0 z"
+ d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
sodipodi:ry="1.0000004"
sodipodi:rx="1"
sodipodi:cy="57.5"
@@ -35250,7 +35250,7 @@
</g>
<path
transform="matrix(3.5999897,0,0,3.1249932,-67.499871,320.6879)"
- d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="57.5"
@@ -35272,11 +35272,11 @@
sodipodi:cy="57.5"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
transform="matrix(3.25,0,0,3.25,-62.875,313.125)" />
<path
transform="matrix(2,0,0,2,-46,385)"
- d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
sodipodi:ry="1"
sodipodi:rx="1"
sodipodi:cy="57.5"
@@ -35292,7 +35292,7 @@
sodipodi:cy="57.5"
sodipodi:rx="1"
sodipodi:ry="1"
- d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+ d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
transform="matrix(4.7519907,0,0,4.1435313,-83.051884,262.12196)" />
<path
inkscape:connector-curvature="0"
@@ -35416,7 +35416,7 @@
sodipodi:cy="38.98439"
sodipodi:rx="15.467961"
sodipodi:ry="5.3033009"
- d="m 43.487067,38.98439 a 15.467961,5.3033009 0 1 1 -30.935922,0 15.467961,5.3033009 0 1 1 30.935922,0 z"
+ d="m 43.487067,38.98439 c 0,2.928932 -6.925242,5.303301 -15.467961,5.303301 -8.542719,0 -15.467961,-2.374369 -15.467961,-5.303301 0,-2.928932 6.925242,-5.303301 15.467961,-5.303301 8.542719,0 15.467961,2.374369 15.467961,5.303301 z"
transform="matrix(1.274286,0,0,1.377124,-7.569123,-16.70193)" />
<path
style="fill:#f57900;fill-rule:evenodd;stroke:#aa4400;stroke-width:1.7812928;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
@@ -35432,7 +35432,7 @@
sodipodi:cy="25.75"
sodipodi:rx="11.5625"
sodipodi:ry="10.125"
- d="m 42.75,25.75 a 11.5625,10.125 0 1 1 -23.125,0 11.5625,10.125 0 1 1 23.125,0 z"
+ d="m 42.75,25.75 c 0,5.591883 -5.176708,10.125 -11.5625,10.125 -6.385792,0 -11.5625,-4.533117 -11.5625,-10.125 0,-5.591883 5.176708,-10.125 11.5625,-10.125 6.385792,0 11.5625,4.533117 11.5625,10.125 z"
transform="matrix(0.8018194,0,0,0.8471126,6.257567,4.5089892)" />
<path
sodipodi:nodetypes="csssssscssscsssccssscscccsccssssccscsscccssssc"
@@ -35575,7 +35575,7 @@
sodipodi:cy="40"
sodipodi:rx="6"
sodipodi:ry="6"
- d="m 36.5,40 a 6,6 0 1 1 -12,0"
+ d="m 36.5,40 c 0,3.313708 -2.686292,6 -6,6 -3.313708,0 -6,-2.686292 -6,-6 0,0 0,0 0,0"
sodipodi:start="0"
sodipodi:end="3.1415927"
sodipodi:open="true"
@@ -35591,7 +35591,7 @@
sodipodi:open="true"
sodipodi:end="3.1415927"
sodipodi:start="0"
- d="m 36.5,40 a 6,6 0 1 1 -12,0"
+ d="m 36.5,40 c 0,3.313708 -2.686292,6 -6,6 -3.313708,0 -6,-2.686292 -6,-6 0,0 0,0 0,0"
sodipodi:ry="6"
sodipodi:rx="6"
sodipodi:cy="40"
@@ -35619,7 +35619,7 @@
sodipodi:open="true"
sodipodi:end="3.1415927"
sodipodi:start="0"
- d="m 36.5,40 a 6,6 0 1 1 -12,0"
+ d="m 36.5,40 c 0,3.313708 -2.686292,6 -6,6 -3.313708,0 -6,-2.686292 -6,-6 0,0 0,0 0,0"
sodipodi:ry="6"
sodipodi:rx="6"
sodipodi:cy="40"
@@ -35643,7 +35643,7 @@
sodipodi:cy="40"
sodipodi:rx="6"
sodipodi:ry="6"
- d="m 36.5,40 a 6,6 0 1 1 -12,0"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list