[Bf-blender-cvs] [79d8617] master: Transfer data: add modifier.
Bastien Montagne
noreply at git.blender.org
Sat Jan 10 00:11:37 CET 2015
Commit: 79d8617424daeda01c01924c7067e1be71516ecb
Author: Bastien Montagne
Date: Fri Jan 9 21:19:12 2015 +0100
Branches: master
https://developer.blender.org/rB79d8617424daeda01c01924c7067e1be71516ecb
Transfer data: add modifier.
Not much to add, modifier uses same code as operator basically, only key difference
is that modifier will never create data layers itself, you have to use dedicated operator
for that.
===================================================================
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_mod_data_transfer.dat
A release/datafiles/blender_icons32/icon32_mod_data_transfer.dat
M release/scripts/startup/bl_ui/properties_data_modifier.py
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/editors/include/UI_icons.h
M source/blender/editors/object/object_data_transfer.c
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_modifier.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/CMakeLists.txt
M source/blender/modifiers/MOD_modifiertypes.h
A source/blender/modifiers/intern/MOD_datatransfer.c
M source/blender/modifiers/intern/MOD_util.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index ed5e847..8fa93b4 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -27,6 +27,137 @@
<defs
id="defs4">
<linearGradient
+ inkscape:collect="always"
+ id="linearGradient20043">
+ <stop
+ style="stop-color:#f6e18c;stop-opacity:1;"
+ offset="0"
+ id="stop20045" />
+ <stop
+ style="stop-color:#f6e18c;stop-opacity:0;"
+ offset="1"
+ id="stop20047" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient20020">
+ <stop
+ style="stop-color:#f6e18c;stop-opacity:1;"
+ offset="0"
+ id="stop20022" />
+ <stop
+ style="stop-color:#f6e18c;stop-opacity:0;"
+ offset="1"
+ id="stop20024" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient18512">
+ <stop
+ id="stop18514"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1;" />
+ <stop
+ id="stop18516"
+ offset="1"
+ style="stop-color:#f20000;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient18495"
+ inkscape:collect="always">
+ <stop
+ id="stop18497"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop18499"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient18479"
+ inkscape:collect="always">
+ <stop
+ id="stop18481"
+ offset="0"
+ style="stop-color:#8d8d8d;stop-opacity:1;" />
+ <stop
+ id="stop18483"
+ offset="1"
+ style="stop-color:#8d8d8d;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient18414">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop18416" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop18418" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient18370"
+ inkscape:collect="always">
+ <stop
+ id="stop18372"
+ offset="0"
+ style="stop-color:#afafaf;stop-opacity:1;" />
+ <stop
+ id="stop18374"
+ offset="1"
+ style="stop-color:#afafaf;stop-opacity:0;" />
+ </linearGradient>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lstart"
+ style="overflow:visible">
+ <path
+ id="path17576"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+ transform="scale(0.8) translate(12.5,0)" />
+ </marker>
+ <linearGradient
+ id="linearGradient17566"
+ inkscape:collect="always">
+ <stop
+ id="stop17568"
+ offset="0"
+ style="stop-color:#cad8ee;stop-opacity:1;" />
+ <stop
+ id="stop17570"
+ offset="1"
+ style="stop-color:#cad8ee;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient17560">
+ <stop
+ id="stop17562"
+ offset="0"
+ style="stop-color:#ffe991;stop-opacity:1;" />
+ <stop
+ id="stop17564"
+ offset="1"
+ style="stop-color:#ffe991;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient17542"
+ inkscape:collect="always">
+ <stop
+ id="stop17544"
+ offset="0"
+ style="stop-color:#799ed3;stop-opacity:1;" />
+ <stop
+ id="stop17546"
+ offset="1"
+ style="stop-color:#799ed3;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
id="linearGradient17265">
<stop
style="stop-color:#ffb769;stop-opacity:1;"
@@ -29053,6 +29184,288 @@
id="linearGradient17872"
xlink:href="#linearGradient319-36-40-2-4"
inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient23974-41">
+ <stop
+ id="stop23976-66"
+ offset="0"
+ style="stop-color:#2561b7;stop-opacity:1;" />
+ <stop
+ id="stop23978-15"
+ offset="1"
+ style="stop-color:#f9fbff;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient319-68">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop320-221" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop321-90" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1610-84">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop1611-86" />
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="1"
+ id="stop1612-6" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient9030-4">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop9032-3" />
+ <stop
+ style="stop-color:white;stop-opacity:0;"
+ offset="1"
+ id="stop9034-9" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient16500-8">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop16502-0" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop16504-648" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient16605">
+ <stop
+ id="stop16607"
+ offset="0"
+ style="stop-color:#2561b7;stop-opacity:1;" />
+ <stop
+ id="stop16609"
+ offset="1"
+ style="stop-color:#f9fbff;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient18105-1">
+ <stop
+ id="stop18107-7"
+ offset="0"
+ style="stop-color:#162d50;stop-opacity:1" />
+ <stop
+ id="stop18109-8"
+ offset="1"
+ style="stop-color:#1e3e70;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient17542"
+ id="linearGradient18237"
+ gradientUnits="userSpaceOnUse"
+ x1="231.35262"
+ y1="465.73871"
+ x2="246.08743"
+ y2="465.14655"
+ gradientTransform="matrix(0.86988738,-0.49325039,0.49325039,0.86988738,0,0.02266763)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient17566"
+ id="linearGradient18239"
+ gradientUnits="userSpaceOnUse"
+ x1="430.78629"
+ y1="290.24094"
+ x2="440.83713"
+ y2="286.97058" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient23974-41"
+ id="linearGradient18243"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.728189,0,0,1.727271,-142.53857,-4.802156)"
+ x1="107.39532"
+ y1="58.065113"
+ x2="127.70434"
+ y2="58.065113" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient319-68"
+ id="linearGradient18245"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.1000194,0,0,1.0998287,110.29549,-8.6726854)"
+ x1="30.389694"
+ y1="95.008034"
+ x2="65.52562"
+ y2="93.69249" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1610-84"
+ id="linearGradient18247"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-6,0)"
+ x1="483.00034"
+ y1="163"
+ x2="476.68781"
+ y2="162.85956" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient9030-4"
+ id="linearGradient18249"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(342.00029,383.00889)"
+ x1="123.36729"
+ y1="-219.24783"
+ x2="134.30893"
+ y2="-218.00888" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient16500-8"
+ id="linearGradient18251"
+ gradientUnits="userSpaceOnUse"
+ x1="475.00034"
+ y1="155"
+ x2="469.75034"
+ y2="155" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient23974-41"
+ id="linearGradient18253"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(14.285126,-0.22103087)"
+ x1="442.81525"
+ y1="290.49384"
+ x2="436.5"
+ y2="290.5249" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18105-1"
+ id="linearGradient18255"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(20.285126,-0.22097087)"
+ x1="445.99902"
+ y1="288.5"
+ x2="407.3793"
+ y2="288.5" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient17560-4"
+ id="linearGradient18241-0"
+ gradientUnits="userSpaceOnUse"
+ x1="327.77432"
+ y1="251.04707"
+ x2="335.80118"
+ y2="247.0696" />
+ <linearGradient
+ id="linearGradient17560-4">
+ <stop
+ id="stop17562-3"
+ offset="0"
+ style="stop-color:#ffe991;stop-opacity:1;" />
+ <stop
+ id="stop17564-1"
+ offset="1"
+ style="stop-color:#ffe991;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18370"
+ id="linearGradient18368"
+ x1="432.83759"
+ y1="289.15814"
+ x2="441.44028"
+ y2="283.54819"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ y2="245.78732"
+ x2="335.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list