Merge branch 'Development' of https://github.com/sideeffects/GameDeve…

…lopmentToolset into Development
sideeffects · Jun 13, 2018 · 5affe95 · 5affe95
2 parents bc23b7a + 8a59c99
commit 5affe95
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 43 deletions.
diff --git a/otls/rop_motion_vectors.hda/INDEX__SECTION b/otls/rop_motion_vectors.hda/INDEX__SECTION
@@ -10,5 +10,5 @@ Inputs:       0 to 0
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Mon Jun 11 19:09:12 2018
+Modified:     Wed Jun 13 10:46:05 2018
 
diff --git a/.../rop_motion_vectors.hda/gamedev_8_8Driver_1rop__motion__vectors/Contents.dir/.OPdummydefs b/.../rop_motion_vectors.hda/gamedev_8_8Driver_1rop__motion__vectors/Contents.dir/.OPdummydefs
diff --git a/...rop_motion_vectors.hda/gamedev_8_8Driver_1rop__motion__vectors/Contents.dir/Contents.mime b/...rop_motion_vectors.hda/gamedev_8_8Driver_1rop__motion__vectors/Contents.dir/Contents.mime
@@ -46,7 +46,7 @@ inputs
 stat
 {
   create 1528765255
-  modify 1528769092
+  modify 1528911635
   author mikel@mikembp-sesi.hitronhub.home
   access 0777
 }
@@ -170,7 +170,7 @@ inputs
 stat
 {
   create 1495467310
-  modify 1528769092
+  modify 1528911427
   author mike@mikembp.local
   access 0777
 }
@@ -3808,7 +3808,7 @@ inputs
 stat
 {
   create 1495666506
-  modify 1528765362
+  modify 1528911393
   author mike@mikembp.local
   access 0777
 }
@@ -6071,7 +6071,7 @@ inputs
 stat
 {
   create 1495480877
-  modify 1528765361
+  modify 1528911392
   author mike@mikembp.local
   access 0777
 }
@@ -6539,7 +6539,7 @@ inputs
 stat
 {
   create 1495471556
-  modify 1528768356
+  modify 1528911392
   author mike@mikembp.local
   access 0777
 }
@@ -7048,7 +7048,7 @@ inputs
 stat
 {
   create 1495471556
-  modify 1528768353
+  modify 1528911392
   author mike@mikembp.local
   access 0777
 }
@@ -8484,7 +8484,7 @@ inputs
 stat
 {
   create 1496109101
-  modify 1528765265
+  modify 1528863024
   author mikel@mikembp-sesi.local
   access 0777
 }
@@ -8518,7 +8518,7 @@ pivot	[ 0	locks=0 ]	(	"centroid"	)
 viewportlod	[ 0	locks=0 ]	(	"full"	)
 addpath	[ 0	locks=0 ]	(	"on"	)
 enable1	[ 0	locks=0 ]	(	"on"	)
-objpath1	[ 8	locks=0 ]	(	`chsop(\"../../../export_node\")`	)
+objpath1	[ 8	locks=0 ]	(	`chsop(\"../../../export_node\")`/__render_sop__	)
 group1	[ 0	locks=0 ]	(	""	)
 expand1	[ 0	locks=0 ]	(	"off"	)
 }
@@ -10151,7 +10151,7 @@ xOrd	[ 0	locks=0 ]	(	"srt"	)
 rOrd	[ 0	locks=0 ]	(	"xyz"	)
 t	[ 0	locks=0 ]	(	0	0	0	)
 r	[ 0	locks=0 ]	(	0	0	0	)
-s	[ 0	locks=0 ]	(	[ sx	0.82842797040939331 ] 	[ sy	0.82842797040939331 ] 	1	)
+s	[ 0	locks=0 ]	(	[ sx	0 ] 	[ sy	0 ] 	1	)
 shear	[ 0	locks=0 ]	(	0	0	0	)
 scale	[ 0	locks=0 ]	(	1	)
 parmgroup_pivotxform	[ 0	locks=0 ]	(	0	)
@@ -10612,7 +10612,7 @@ inputs
 stat
 {
   create 1495466742
-  modify 1528769347
+  modify 1528911949
   author mike@mikembp.local
   access 0777
 }
@@ -12695,7 +12695,7 @@ soho_compression	[ 0	locks=0 ]	(	ext	)
 soho_foreground	[ 0	locks=0 ]	(	"off"	)
 soho_initsim	[ 0	locks=0 ]	(	"off"	)
 soho_viewport_menu	[ 0	locks=0 ]	(	"on"	)
-images6	[ 0	locks=0 ]	(	0	0	0	0	0	)
+images6	[ 0	locks=0 ]	(	1	1	1	1	1	)
 output6	[ 0	locks=0 ]	(	0	0	0	0	)
 vm_pfilter	[ 0	locks=0 ]	(	"gaussian -w 2"	)
 vm_sfilter	[ 0	locks=0 ]	(	alpha	)
@@ -12758,7 +12758,7 @@ shutteroffset	[ 0	locks=0 ]	(	1	)
 vm_traceblur	[ 0	locks=0 ]	(	"off"	)
 sampling7	[ 0	locks=0 ]	(	0	0	0	0	0	0	)
 vm_samples	[ 0	locks=0 ]	(	3	3	)
-vm_dorayvariance	[ 0	locks=0 ]	(	"on"	)
+vm_dorayvariance	[ 0	locks=0 ]	(	"off"	)
 vm_colorspace	[ 0	locks=0 ]	(	gamma	)
 vm_maxnumberofindirectsamples	[ 0	locks=0 ]	(	"Maximum number of indirect samples: `floor(ch(vm_maxraysamples) * (ch(vm_globalquality) * (ch(vm_diffusequality) + ch(vm_sssquality) + ch(vm_reflectionquality) + ch(vm_refractionquality) ) + 1) )`"	)
 vm_minraysamples	[ 0	locks=0 ]	(	1	)
@@ -14264,7 +14264,7 @@ Content-Type: text/plain
 version 0.8
 stdswitcher	[ 0	locks=0 ]	(	0	)
 scaletype	[ 0	locks=0 ]	(	"res"	)
-imageres	[ 8	locks=0 ]	(	[ imageres1	256 ] 	[ imageres2	256 ] 	)
+imageres	[ 0	locks=0 ]	(	[ imageres1	256 ] 	[ imageres2	256 ] 	)
 imagefract	[ 0	locks=0 ]	(	0.5	0.25	)
 imageaspect	[ 0	locks=0 ]	(	1	)
 keepaspect	[ 0	locks=0 ]	(	"off"	)
@@ -14737,7 +14737,7 @@ inputs
 stat
 {
   create 1496170384
-  modify 1528767468
+  modify 1528911397
   author mikel@mikembp-sesi.local
   access 0777
 }
@@ -14771,20 +14771,6 @@ Content-Type: text/plain
       flags = 0
       segment { length = 0 value = 64 64 expr = "ch(\"../../f2\") - ch(\"../../f1\") + 1" }
     }
-    channel size1 {
-      lefttype = extend
-      righttype = extend
-      default = 512
-      flags = 0
-      segment { length = 0 value = 512 512 expr = ch(\"../../objnet1/cam1/resx\") }
-    }
-    channel size2 {
-      lefttype = extend
-      righttype = extend
-      default = 512
-      flags = 0
-      segment { length = 0 value = 512 512 expr = ch(\"../../objnet1/cam1/resy\") }
-    }
   }
 
 --HOUDINIMIMEBOUNDARY0xD3ADD339-0x00000F49-0x56B122C9-0x00000001HOUDINIMIMEBOUNDARY
@@ -14798,8 +14784,8 @@ filename	[ 0	locks=0 ]	(	$TEMP/mv/motion_vectors_comped.$F4.exr	"cinspace lin ci
 nodename	[ 0	locks=0 ]	(	"userdef"	)
 reload	[ 0	locks=0 ]	(	0	)
 subframes	[ 0	locks=0 ]	(	"off"	)
-overridesize	[ 0	locks=0 ]	(	"size"	)
-size	[ 0	locks=0 ]	(	[ size1	1024 ] 	[ size2	1024 ] 	)
+overridesize	[ 0	locks=0 ]	(	"natural"	)
+size	[ 0	locks=0 ]	(	256	256	)
 sizemenu	[ 0	locks=0 ]	(	0	)
 filter	[ 0	locks=0 ]	(	box	)
 overrideaspect	[ 0	locks=0 ]	(	"off"	)

diff --git a/otls/rop_texture_sheets_2.hda/INDEX__SECTION b/otls/rop_texture_sheets_2.hda/INDEX__SECTION
@@ -10,5 +10,5 @@ Inputs:       0 to 1
 Subnet:       true
 Python:       false
 Empty:        false
-Modified:     Mon Jun 11 19:04:55 2018
+Modified:     Tue Jun 12 15:52:21 2018
 
diff --git a/...ure_sheets_2.hda/gamedev_8_8Driver_1rop__texture__sheets_8_82.0/Contents.dir/.OPdummydefs b/...ure_sheets_2.hda/gamedev_8_8Driver_1rop__texture__sheets_8_82.0/Contents.dir/.OPdummydefs
diff --git a/...re_sheets_2.hda/gamedev_8_8Driver_1rop__texture__sheets_8_82.0/Contents.dir/Contents.mime b/...re_sheets_2.hda/gamedev_8_8Driver_1rop__texture__sheets_8_82.0/Contents.dir/Contents.mime
@@ -46,7 +46,7 @@ inputs
 stat
 {
   create 1523923600
-  modify 1528765656
+  modify 1528769150
   author mikel@mikembp-sesi.local
   access 0777
 }
@@ -112,7 +112,7 @@ inputs
 stat
 {
   create 1496111784
-  modify 1523925258
+  modify 1528842596
   author mikel@mikembp-sesi.local
   access 0777
 }
@@ -12962,7 +12962,7 @@ Content-Disposition: attachment; filename="hdaroot/COMPOSITING/HIPNAME__F_exr.de
 Content-Type: text/plain
 
 comment ""
-position -11.4782 3.66674
+position -11.6017 3.8931
 connectornextid 1
 flags =  lock off model off template off footprint off xray off bypass off display off render off highlight off unload off savedata off compress on colordefault off exposed on
 outputsNamed3
@@ -12978,7 +12978,7 @@ inputs
 stat
 {
   create 1496111784
-  modify 1528768954
+  modify 1528842601
   author mikel@mikembp-sesi.local
   access 0777
 }
@@ -18275,7 +18275,7 @@ Content-Type: text/plain
 version 0.8
 stdswitcher	[ 0	locks=0 ]	(	0	)
 warp	[ 0	locks=0 ]	(	"expression"	)
-index	[ 8	locks=0 ]	(	[ index	7 ] 	)
+index	[ 8	locks=0 ]	(	[ index	3 ] 	)
 choppath	[ 0	locks=0 ]	(	""	)
 round	[ 0	locks=0 ]	(	"nearest"	)
 }
@@ -18425,7 +18425,7 @@ Content-Type: text/plain
 version 0.8
 stdswitcher	[ 0	locks=0 ]	(	0	)
 warp	[ 0	locks=0 ]	(	"expression"	)
-index	[ 8	locks=0 ]	(	[ index	7 ] 	)
+index	[ 8	locks=0 ]	(	[ index	3 ] 	)
 choppath	[ 0	locks=0 ]	(	""	)
 round	[ 0	locks=0 ]	(	"nearest"	)
 }
@@ -18509,7 +18509,7 @@ Content-Type: text/plain
 version 0.8
 stdswitcher	[ 0	locks=0 ]	(	0	)
 warp	[ 0	locks=0 ]	(	"expression"	)
-index	[ 8	locks=0 ]	(	[ index	7 ] 	)
+index	[ 8	locks=0 ]	(	[ index	3 ] 	)
 choppath	[ 0	locks=0 ]	(	""	)
 round	[ 0	locks=0 ]	(	"nearest"	)
 }
@@ -23693,7 +23693,7 @@ inputs
 stat
 {
   create 1496111784
-  modify 1528764043
+  modify 1528843894
   author mikel@mikembp-sesi.local
   access 0777
 }
@@ -23727,7 +23727,7 @@ pivot	[ 0	locks=0 ]	(	"centroid"	)
 viewportlod	[ 0	locks=0 ]	(	"full"	)
 addpath	[ 0	locks=0 ]	(	"on"	)
 enable1	[ 0	locks=0 ]	(	"on"	)
-objpath1	[ 0	locks=0 ]	(	`chsop(\"../../../node_to_render\")`	)
+objpath1	[ 0	locks=0 ]	(	`chsop(\"../../../node_to_render\")`/__render_sop__	)
 group1	[ 0	locks=0 ]	(	""	)
 expand1	[ 0	locks=0 ]	(	"off"	)
 }
@@ -28912,7 +28912,7 @@ inputs
 stat
 {
   create 1496111784
-  modify 1528764043
+  modify 1528769095
   author mikel@mikembp-sesi.local
   access 0777
 }
@@ -31217,7 +31217,7 @@ take	[ 0	locks=0 ]	(	_current_	)
 camera	[ 0	locks=0 ]	(	`chsop(\"../camera\")`	)
 override_camerares	[ 8	locks=0 ]	(	[ override_camerares	1 ] 	)
 res_fraction	[ 0	locks=0 ]	(	specific	)
-res_override	[ 0	locks=0 ]	(	[ res_overridex	256 ] 	[ res_overridey	256 ] 	)
+res_override	[ 8	locks=0 ]	(	[ res_overridex	256 ] 	[ res_overridey	256 ] 	)
 res_overrideMenu	[ 0	locks=0 ]	(	0	)
 aspect_override	[ 0	locks=0 ]	(	1	)
 images	[ 0	locks=0 ]	(	0	0	0	0	0	)