Commit graph

45126 commits

Author SHA1 Message Date
Roy Nieterau
58700fb270 Merge branch 'master' of https://github.com/Colorbleed/colorbleed-config 2017-10-24 12:12:43 +02:00
Roy Nieterau
db08b84202 Fix integrate to use api.Session instead of os.environ 2017-10-24 12:01:52 +02:00
Roy Nieterau
f600e267ff Remove redundant globals that are make believe that template and project will remain static :) 2017-10-24 12:00:57 +02:00
Roy Nieterau
dce57a912e Merge pull request #24 from BigRoy/master
Implement new-style loaders and fix PLN-26
2017-10-24 11:31:51 +02:00
Roy Nieterau
078b06c892 Fix V-ray extension being wrong in Deadline when image format was never changed from .png 2017-10-24 11:30:32 +02:00
Roy Nieterau
6f9e5c0acf Fix REN-8; active deadline user on local machine is submitted with Deadline job 2017-10-24 11:27:34 +02:00
Roy Nieterau
d3ec608268 Remove Session import 2017-10-24 11:19:35 +02:00
Roy Nieterau
605774480c Merge branch 'tmp'
Conflicts:
	colorbleed/maya/lib.py
	colorbleed/plugins/maya/load/load_rig.py
	colorbleed/plugins/maya/publish/collect_renderlayers.py
	colorbleed/plugins/publish/collect_assumed_destination.py
	colorbleed/plugins/publish/integrate.py
2017-10-24 11:15:50 +02:00
Roy Nieterau
f5d6956060 Fix merge 2017-10-24 11:07:02 +02:00
Wijnand Koreman
28250b57a5 Merge pull request #23 from aardschok/SET-0003
Set 0003
2017-10-24 10:42:49 +02:00
aardschok
4573157288 added repair function with prompt 2017-10-24 10:28:12 +02:00
Roy Nieterau
b2af294bd9 Fix PLN-26 2017-10-24 10:06:01 +02:00
Roy Nieterau
ca9abc8312 Update Loaders to new-style plug-ins; inherit from colorbleed.maya.plugin.ReferenceLoader; fix updating referenced containers to also contain "new" nodes 2017-10-24 10:03:20 +02:00
aardschok
e715602aa6 improved error message, removed print, cosmetics 2017-10-24 09:44:08 +02:00
Wijnand Koreman
7f329ac531 Merge pull request #21 from aardschok/SET-0003
Setdress transforms
2017-10-23 17:59:58 +02:00
aardschok
d63a75fdeb improved method of getting illegal transform node 2017-10-23 17:58:16 +02:00
aardschok
721ef1edc8 changed argument names back to mathematical names 2017-10-23 17:57:32 +02:00
aardschok
722a1b5015 added maya.lib import 2017-10-23 17:57:00 +02:00
aardschok
8f80d7405d add transform check for valid transformations 2017-10-23 16:27:47 +02:00
aardschok
571beb6c40 added matrix to maya.lib 2017-10-23 16:27:19 +02:00
Wijnand Koreman
95b85f332f Merge pull request #20 from aardschok/PLN-0003
Temp fix for Abc locader
2017-10-23 16:14:57 +02:00
aardschok
66be3bef50 Temp fix for Abc locader 2017-10-23 16:14:19 +02:00
aardschok
bc85f19fcb resolved conflit 2017-10-23 15:40:19 +02:00
Wijnand Koreman
ce0f0ae6a9 Merge pull request #19 from aardschok/PLN-0003
Setdress
2017-10-23 13:02:17 +02:00
aardschok
96e3e04e6c added unlocked context manager for update 2017-10-23 12:51:58 +02:00
aardschok
26f4c22bc9 updated docstrings 2017-10-23 12:32:34 +02:00
aardschok
cf5a0cc8ce moved import of avalon api to the top 2017-10-23 12:25:21 +02:00
aardschok
133524880e added warning for gpu caches, no full support yet 2017-10-23 12:24:57 +02:00
aardschok
e30d14bc4d added support for ither model types 2017-10-23 11:34:07 +02:00
aardschok
7197049643 fixed bug in representation reqeust 2017-10-23 11:15:59 +02:00
aardschok
cb4e0323ef removed old logic for get representation 2017-10-23 10:51:12 +02:00
aardschok
cf24e3978f now selects only hierarchy nodes from collect_setdress 2017-10-23 10:28:23 +02:00
aardschok
ec6c3f9dd4 clean up 2017-10-23 10:14:49 +02:00
aardschok
8a516e7bb9 cleaned code, removed line 2017-10-23 10:09:27 +02:00
Wijnand Koreman
48d68e5b14 Merge pull request #1 from BigRoy/dev
Dev
2017-10-23 10:01:46 +02:00
Roy Nieterau
0f0479490e Fix generate uuid action so it uses pipeline methods and applies the ids as required by the instance.data['asset'] (instead of current context asset) 2017-10-22 00:34:27 +02:00
Roy Nieterau
4396ec06ba Implement PLN-22 2017-10-22 00:05:52 +02:00
Roy Nieterau
c77f305269 Add icons and cleanup docstrings 2017-10-21 23:52:46 +02:00
Roy Nieterau
6905534738 Improve logging order and log warning when instance is empty 2017-10-21 16:31:55 +02:00
Roy Nieterau
0057e5ed1a Fix issue where overrides on instance would add a new one on update, support parenting into hierarchy more solidly, support parenting during update when root is parented to something. 2017-10-21 16:23:46 +02:00
Roy Nieterau
a0dced9981 Remove debugging print statement 2017-10-21 12:25:36 +02:00
Roy Nieterau
2ab4d0bdc2 Fix setdress api and implement load, update, remove correctly on SetDressLoader 2017-10-21 12:06:27 +02:00
Roy Nieterau
2b4d1a4ad7 Simplify ModelLoader logic 2017-10-21 12:05:35 +02:00
Roy Nieterau
1ca84cb94a Refactor loaders 2017-10-21 12:05:16 +02:00
Roy Nieterau
8449e10244 Refactor host.update and host.remove to api.update and api.remove 2017-10-21 09:32:04 +02:00
Roy Nieterau
76a6ce4ce6 Remove unused import 2017-10-21 09:29:57 +02:00
Roy Nieterau
758b4a116f Move setdress_api.py so it can be loaded automatically 2017-10-21 09:26:20 +02:00
Roy Nieterau
cf3c009001 Merge branch 'PLN-0003' of https://github.com/aardschok/colorbleed-config into dev
Conflicts:
	colorbleed/plugins/maya/load/load_animation.py
	colorbleed/plugins/maya/load/load_model.py
2017-10-21 09:25:35 +02:00
Roy Nieterau
88ff47311e Implement gpuCache loader prototype 2017-10-20 18:32:13 +02:00
aardschok
e7f7efad8c initial commit for ns validator 2017-10-20 18:12:38 +02:00