From 69c7d7d86ccbabc40c7943b903bde5c499b187ad Mon Sep 17 00:00:00 2001
From: winnubstj <winnubstj@janelia.hhmi.org>
Date: Sat, 7 Sep 2019 16:33:48 -0400
Subject: [PATCH] Changes to area slicing for 2.8
---
MainFunctions/StageBlender.py | 5 ++---
.../__pycache__/ImportBlender.cpython-37.pyc | Bin 4720 -> 4677 bytes
.../__pycache__/LegacyStage.cpython-37.pyc | Bin 5635 -> 5592 bytes
.../__pycache__/StageBlender.cpython-37.pyc | Bin 6684 -> 6631 bytes
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/MainFunctions/StageBlender.py b/MainFunctions/StageBlender.py
index 14d8e61..1fcf0db 100644
--- a/MainFunctions/StageBlender.py
+++ b/MainFunctions/StageBlender.py
@@ -200,7 +200,6 @@ def StageSession(sessionFolder,display):
# Import SWC
bpy.context.view_layer.active_layer_collection = bpy.context.view_layer.layer_collection.children[neuronCol.name]
neurons = scene["neurons"] if isinstance(scene["neurons"],list) else [scene["neurons"]]
- #neurons = neurons[1000:len(neurons)]
counter = 0
for neuron in neurons:
counter = counter+1
@@ -225,10 +224,10 @@ def StageSession(sessionFolder,display):
print("Slicing..")
for area in areas:
bpy.ops.object.select_all(action='DESELECT')
- bpy.context.scene.objects.active = None
+ bpy.context.view_layer.objects.active = None
if "acronym" in area:
# new mesh obj.
- axM = axon.to_mesh(bpy.context.scene, False, 'PREVIEW')
+ axM = axon.to_mesh()
axM = bpy.data.objects.new('{0}_axon_{1}'.format(neuron["id"],area["acronym"]), axM)
bpy.context.scene.objects.link(axM)
axM.matrix_world = axon.matrix_world
diff --git a/MainFunctions/__pycache__/ImportBlender.cpython-37.pyc b/MainFunctions/__pycache__/ImportBlender.cpython-37.pyc
index 6e7cf65cc79d7de12044c994816e14a7b56ac8be..893d880d2efe0cc39a52bf167b7828440fc98c0b 100644
GIT binary patch
delta 42
wcmeyMa#V%eiI<m)0SFHME8fU`mRZ2o*(%02u_PxkDLA<(v!G<NFiR{S02cKPP5=M^
delta 85
zcmX@A@<D~$iI<m)0SKn9*V)K@mf1SP*(xTqIJKxaraUt*uQaK+BrC?HD8C>nzaqvr
nu_PxkNg<#pKPxr4q&UVmzqB~jCo?^xM4>3PAb;}<=2$)e*UBEo
diff --git a/MainFunctions/__pycache__/LegacyStage.cpython-37.pyc b/MainFunctions/__pycache__/LegacyStage.cpython-37.pyc
index 7eb4f765cf272b6baace4fc477e658c2f4813774..119ae6f09c370f6933af92826842574c4c081496 100644
GIT binary patch
delta 42
wcmZqHxuMPN#LLUY00amB6>sF;C@f&@Y!&01Sdx>N6r5a?Sx~b1yD$$E01O!oivR!s
delta 85
zcmcbi-K@jy#LLUY00b`cbT)Et6t+%twu%WYPAw{qDbLKyD@`gc$%=6)$}dRDuZZzY
nEXhesQV1x@&q_@$DUR{YFD*{>$xP2EQ7B3+$lrWMn1=}fpM4#o
diff --git a/MainFunctions/__pycache__/StageBlender.cpython-37.pyc b/MainFunctions/__pycache__/StageBlender.cpython-37.pyc
index ed321c0471fd8c55af476b7d31f447b2ef5cd63f..0fda89d98398810c790ed24049c552af2086f6e1 100644
GIT binary patch
delta 576
zcmbPZ^4yruiI<m)0SKlEm&AV8p2+t`z{c4s#y7DfCow5FxhS)sWU?t^9OJ6ZQy9;%
zbKa>jaABCh9D8YUCg)4<BPHr7QO%5u3>D96<XjkH@6{@lFl5<f`DFQ~M5n~`0%cMd
zfFgofhFK=@ektZP3fXKEIEqfym@M#L$WUtzl#|FZSs;}XJ9#;mcV=9TLW;R0gBU|f
zJV-BCXHcz0jd@mZmQ+eYN@7Y<FH@~$jYW!}Btwm5yiZCpkPN8-nIo7b1hNCj0@)u5
zRGX5L+RMbqFoC1+R5%03Mu@7Epp>-9(cI0hB2cw~DVZeOn+39W0#~8PWMv+E#uby3
zdDIy{Oz!5fWlWiTlII@dt;s8R-Q~o9;aUVH7=f&p%s?U?h=JgPeUaE?UcMAYvB^bz
zcNw)e2k=WVO)eI+V$_<vPSAk!7JERDYnZ2N_~v_pUzizFCtnsl#Mm@>n%ERZtI68p
zI*hK9BgEAh4JX%&Coo2CejqN&$jCVPn}iM{$7E&6h{Q;s9h&?_!9c1g3P{{yF0L%T
z#gdy?l2OD25)1<oGeATFhyXe57O!V+L4Hw*Q%-7LN@`J2GDwWuCpA4WxiYvUF+H^?
P0;H53L_|)$Bk2GDcb%#w
delta 541
zcmaEEJjaC3iI<m)0SGeITEyDwOyqlGo$hQE6Iz^FR2);DnU`0ZR9uo3<5HAgkd$8$
z<C|ELlbECsP?VpQnp{#G<C|Yvoa&RAo>8Julv<EKnTs)wam(gR#xv}k&uR=@7$z{s
z-kEI2`BLy)iF!&@Gb1BI#fKU>7lzmulbg6z<vEH@)tD^sFJZ_M%o0ioN{L;_Tx$;G
zNo1KUkV=W0T*T#V9ABf5VlK%b#*mWG3)Bx*8&qpiW1bb9C6$txl9ZC%%T#MwW04{#
z$xve%?~{@;`2&|EYf?&TO4?*TZgIxg$!grqu5v(~c3D1Ifhn0Jo0tVOH)H}=q1@zm
z-1dx{ChPI2Gya+!#$(HvH+c%rJ;tcX#k}rpqQGD*5}ka2SDaCF@(tb;AZg2Ymr-l8
zG`|!R=PmYtAlEQY*YL@vf>w;0lM4h5Hm?-?!pxX5d7kJY#>UBsVpA9`Cw~*uVRV_S
zEUw0AFxg8yfiYt9YH?9UMyAOJC3F~tCcl%2NQ?m5qsd<s1hOs?NZevBt}MRAlABnP
zQN#oi3<VL>K}0-=U<MMmcs+9q@{3BGa#HhBQj3a`Kw{iJsp*NymBA&6>8VBGAf@ae
KB4YA#Ne2KNucW>J