[Bf-blender-cvs] [644cd00d1a6] soc-2018-npr: Merge branch 'blender2.8' of git://git.blender.org/blender

Commit: 644cd00d1a647eb1e55263722997544a1a2cc91e Author: Nick Wu Date: Mon Apr 30 08:58:47 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB644cd00d1a647eb1e55263722997544a1a2cc91e Merge branch 'blender2.8' of git://git.blender.org/blender

[Bf-blender-cvs] [61d3c1261c5] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 61d3c1261c5d9e40c41ae540b83952e411670fe8 Author: Nick Wu Date: Sun Dec 23 19:09:42 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB61d3c1261c5d9e40c41ae540b83952e411670fe8 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [54443b6d900] soc-2018-npr: Fix merge errors.

Commit: 54443b6d900bd3ebd4dd848c0e2f94ba95f8cdad Author: Nick Wu Date: Sat Dec 8 22:55:29 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB54443b6d900bd3ebd4dd848c0e2f94ba95f8cdad Fix merge errors. === M

[Bf-blender-cvs] [a1a526e5576] soc-2018-npr: added example functions for accessing LANPR occlusion data

Commit: a1a526e5576384aade7aec3d66ed00886911d337 Author: Nick Wu Date: Mon Nov 26 21:47:11 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBa1a526e5576384aade7aec3d66ed00886911d337 added example functions for accessing LANPR occlusion data

[Bf-blender-cvs] [e4d987d7fbf] soc-2018-npr: Added temporary contour bypass for smooth contour modifier build.

Commit: e4d987d7fbf886e9ba1040a8d640574a16cd1cf3 Author: Nick Wu Date: Mon Nov 26 20:17:49 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBe4d987d7fbf886e9ba1040a8d640574a16cd1cf3 Added temporary contour bypass for smooth contour modifier build

[Bf-blender-cvs] [3c7da86849f] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 3c7da86849fecfe099b07b9f9a9869cb57111b3f Author: Nick Wu Date: Mon Nov 19 12:51:52 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB3c7da86849fecfe099b07b9f9a9869cb57111b3f Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [c94b494f20d] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: c94b494f20de24f8fbecd97b324a5739bdf02970 Author: Nick Wu Date: Mon Nov 26 20:15:13 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBc94b494f20de24f8fbecd97b324a5739bdf02970 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [821aa86d987] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 821aa86d98784a529bc80820d7e7164a04eb2fce Author: Nick Wu Date: Wed Nov 14 11:32:17 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB821aa86d98784a529bc80820d7e7164a04eb2fce Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [13a654d0f3f] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 13a654d0f3f33a6da9e59cbe10911978a70fb49c Author: Nick Wu Date: Wed Nov 14 11:34:27 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB13a654d0f3f33a6da9e59cbe10911978a70fb49c Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [b77c6a859ec] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: b77c6a859ec62139e079003b0ac2a4458620d521 Author: Nick Wu Date: Wed Oct 31 13:45:08 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBb77c6a859ec62139e079003b0ac2a4458620d521 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [fc650ae86a8] soc-2018-npr: Make ui work under new api.

Commit: fc650ae86a8b60c6e91fb36078b3256952947d76 Author: Nick Wu Date: Wed Nov 7 22:37:14 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBfc650ae86a8b60c6e91fb36078b3256952947d76 Make ui work under new api

[Bf-blender-cvs] [7a34d16d7a1] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 7a34d16d7a11561de621d0bd16b54a0ffea4d744 Author: Nick Wu Date: Sun Oct 21 14:16:32 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB7a34d16d7a11561de621d0bd16b54a0ffea4d744 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [fc94e46f367] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: fc94e46f367abfbe8cc58c2f0dbe93292c348cbc Author: Nick Wu Date: Thu Oct 25 17:54:30 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBfc94e46f367abfbe8cc58c2f0dbe93292c348cbc Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [8ae40f4fcb5] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 8ae40f4fcb571818ac83325ecedfe051e82b0c15 Author: Nick Wu Date: Wed Sep 19 22:24:36 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB8ae40f4fcb571818ac83325ecedfe051e82b0c15 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [6a638e95551] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr, also fix errors in modifier code.

Commit: 6a638e95551bdc4d0310b392b39b8a7d8eed6517 Author: Nick Wu Date: Sat Oct 20 13:05:21 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB6a638e95551bdc4d0310b392b39b8a7d8eed6517 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr, also fix errors

[Bf-blender-cvs] [0bc6e431cc4] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 0bc6e431cc47fa41c2544d6ffead19c61bac2a68 Author: Nick Wu Date: Wed Oct 3 18:30:02 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB0bc6e431cc47fa41c2544d6ffead19c61bac2a68 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [74294b8686a] soc-2018-npr: Fix interface lock situation reported by DarkDefender.

Commit: 74294b8686ab107dd24b98431400a4a03ffb7bb4 Author: Nick Wu Date: Mon Sep 17 21:49:08 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB74294b8686ab107dd24b98431400a4a03ffb7bb4 Fix interface lock situation reported by DarkDefender

[Bf-blender-cvs] [923f59a984f] soc-2018-npr: DPIX normal controlled line width

Commit: 923f59a984f80eb4f010366003b858c4558b4501 Author: Nick Wu Date: Sun Sep 16 15:35:41 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB923f59a984f80eb4f010366003b858c4558b4501 DPIX normal controlled line width

[Bf-blender-cvs] [bef1fb79ee5] soc-2018-npr: Vertical line hack: tip point threshod fix and a condition branch.

Commit: bef1fb79ee52a000419bc131e52957906464a06d Author: Nick Wu Date: Sun Sep 16 15:00:57 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBbef1fb79ee52a000419bc131e52957906464a06d Vertical line hack: tip point threshod fix and a condition branch

[Bf-blender-cvs] [1bd6f3605d0] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 1bd6f3605d0e12f6b595ca2dadaed8c177cdf3bd Author: Nick Wu Date: Sat Sep 15 11:03:29 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB1bd6f3605d0e12f6b595ca2dadaed8c177cdf3bd Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [843a57e3a5a] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 843a57e3a5a01449735b8bc68743afa11522268a Author: Nick Wu Date: Sun Sep 16 15:02:02 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB843a57e3a5a01449735b8bc68743afa11522268a Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [85f6277e6cf] soc-2018-npr: Possibly fixed shader errors, but don't know exactly what caused it.

Commit: 85f6277e6cf7760d422b3d3fe440a48e5e905783 Author: Nick Wu Date: Wed Sep 12 23:03:34 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB85f6277e6cf7760d422b3d3fe440a48e5e905783 Possibly fixed shader errors, but don't know exactly what caused

[Bf-blender-cvs] [b3ed2a87512] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: b3ed2a875122ca3d1224b9ed534c5e5fb2d3186a Author: Nick Wu Date: Wed Sep 12 22:27:01 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBb3ed2a875122ca3d1224b9ed534c5e5fb2d3186a Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [c44e716f9c9] soc-2018-npr: Fixed still frame render cache out of date error.

Commit: c44e716f9c9898d11f1ca0f73928734cdd4160aa Author: Nick Wu Date: Fri Sep 7 22:16:21 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBc44e716f9c9898d11f1ca0f73928734cdd4160aa Fixed still frame render cache out of date error

[Bf-blender-cvs] [44981260169] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 4498126016926cf89f426499d691d4c1490d17ca Author: Nick Wu Date: Fri Sep 7 23:13:23 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4498126016926cf89f426499d691d4c1490d17ca Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [dacceb573f7] soc-2018-npr: Fixed vertical line missed calculations.

Commit: dacceb573f7a41510dcc80d427923162ba731dff Author: Nick Wu Date: Thu Sep 6 13:39:55 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBdacceb573f7a41510dcc80d427923162ba731dff Fixed vertical line missed calculations

[Bf-blender-cvs] [fceb384ad1c] soc-2018-npr: Partly fixed "Absolute horizontal/vertical" situations.

Commit: fceb384ad1ca9d8c27b195fc0ad397a9dcd8544e Author: Nick Wu Date: Thu Sep 6 12:01:26 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBfceb384ad1ca9d8c27b195fc0ad397a9dcd8544e Partly fixed "Absolute horizontal/vertical"

[Bf-blender-cvs] [b6b0d986bb5] soc-2018-npr: Fixed contour priority. Fixed software mode line type shader.

Commit: b6b0d986bb538e20eafb809069c3dfc8e724387f Author: Nick Wu Date: Thu Sep 6 10:49:22 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBb6b0d986bb538e20eafb809069c3dfc8e724387f Fixed contour priority. Fixed software mode line type shader

[Bf-blender-cvs] [3ab0ae97cdd] soc-2018-npr: Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

Commit: 3ab0ae97cddd14e7b963e9080a57c6d9e56f34c0 Author: Nick Wu Date: Thu Sep 6 09:54:20 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB3ab0ae97cddd14e7b963e9080a57c6d9e56f34c0 Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

[Bf-blender-cvs] [7f4daea0c08] soc-2018-npr: Fixed line width incorrect variations under different aspect ratios. commented weird code in culling.

Commit: 7f4daea0c088ab13b8d46d4b6f68763379161e57 Author: Nick Wu Date: Thu Sep 6 09:48:04 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB7f4daea0c088ab13b8d46d4b6f68763379161e57 Fixed line width incorrect variations under different aspect ratios. commented weird code

[Bf-blender-cvs] [cdad75303a5] soc-2018-npr: Fixed line width incorrect variations under different aspect ratios.

Commit: cdad75303a5040cc4152da25010fdd1b313fa065 Author: Nick Wu Date: Thu Sep 6 09:48:04 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBcdad75303a5040cc4152da25010fdd1b313fa065 Fixed line width incorrect variations under different aspect ratios

[Bf-blender-cvs] [4df5506b22f] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 4df5506b22f90d3ce0b6d3ec7761b289552d9b02 Author: Nick Wu Date: Thu Sep 6 08:30:31 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4df5506b22f90d3ce0b6d3ec7761b289552d9b02 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [592b2bd5e48] soc-2018-npr: Fixed DPIX ortho view.

Commit: 592b2bd5e488d6da57253dc9928e329d9125d8a7 Author: Nick Wu Date: Thu Sep 6 09:01:50 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB592b2bd5e488d6da57253dc9928e329d9125d8a7 Fixed DPIX ortho view. === M

[Bf-blender-cvs] [eeeee3b10af] soc-2018-npr: Fixed software mode ortho condition errors in culling. Now working.

Commit: e3b10afc76f7c17b4a1364a7e678e909abd3 Author: Nick Wu Date: Thu Sep 6 09:25:22 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBe3b10afc76f7c17b4a1364a7e678e909abd3 Fixed software mode ortho condition errors in culling. Now working

[Bf-blender-cvs] [f0eca87df63] soc-2018-npr: Fixed collection header name

Commit: f0eca87df637708504d7e79d9df004213adce675 Author: Nick Wu Date: Tue Sep 4 12:56:46 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBf0eca87df637708504d7e79d9df004213adce675 Fixed collection header name

[Bf-blender-cvs] [de2c47cbf1e] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: de2c47cbf1e6a110ada8caedf6fc996cec760e09 Author: Nick Wu Date: Tue Sep 4 21:52:48 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBde2c47cbf1e6a110ada8caedf6fc996cec760e09 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [3fc578d7cb4] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 3fc578d7cb4409aaba86ea179f27fdf71554a733 Author: Nick Wu Date: Sat Sep 1 11:03:10 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB3fc578d7cb4409aaba86ea179f27fdf71554a733 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [552d256cfdc] soc-2018-npr: Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

Commit: 552d256cfdc7fdb84502d92957912391ca85860b Author: Nick Wu Date: Wed Aug 29 19:08:14 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB552d256cfdc7fdb84502d92957912391ca85860b Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

[Bf-blender-cvs] [ef234a2e61d] soc-2018-npr: Software crease threshold follow DPIX's

Commit: ef234a2e61deab309606df9cee724e54bf7be76b Author: Nick Wu Date: Fri Aug 31 21:48:19 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBef234a2e61deab309606df9cee724e54bf7be76b Software crease threshold follow DPIX's

[Bf-blender-cvs] [e9d3c2e8fb5] soc-2018-npr: Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

Commit: e9d3c2e8fb53e489acc3b60668643237111d3320 Author: Nick Wu Date: Wed Aug 29 18:42:08 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBe9d3c2e8fb53e489acc3b60668643237111d3320 Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

[Bf-blender-cvs] [1e70595e05e] soc-2018-npr: Fixed file data blocks linking error.

Commit: 1e70595e05ecc94b7121eeb0de3b43fc1761c797 Author: Nick Wu Date: Tue Aug 28 18:52:40 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB1e70595e05ecc94b7121eeb0de3b43fc1761c797 Fixed file data blocks linking error

[Bf-blender-cvs] [bcc3003cb41] soc-2018-npr: Fixed chained line type display control

Commit: bcc3003cb41c6992c5e321b8242b209ec082e7be Author: Nick Wu Date: Tue Aug 28 18:23:58 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBbcc3003cb41c6992c5e321b8242b209ec082e7be Fixed chained line type display control

[Bf-blender-cvs] [f33c3d157c2] soc-2018-npr: Fixed dropdown list reference lost issue.

Commit: f33c3d157c21e82dc5f9916205191680c8f1bc10 Author: Nick Wu Date: Tue Aug 28 16:07:17 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBf33c3d157c21e82dc5f9916205191680c8f1bc10 Fixed dropdown list reference lost issue

[Bf-blender-cvs] [8072b683875] soc-2018-npr: Directional light control object ok, fixing file rw

Commit: 8072b6838755f2493fade14a904fa9f818a94aed Author: Nick Wu Date: Tue Aug 28 17:34:12 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB8072b6838755f2493fade14a904fa9f818a94aed Directional light control object ok, fixing file rw

[Bf-blender-cvs] [775df5a1d53] soc-2018-npr: Fix directional object matrix error

Commit: 775df5a1d53e915d8c5cea4f52d7f86881c4f93c Author: Nick Wu Date: Tue Aug 28 18:10:18 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB775df5a1d53e915d8c5cea4f52d7f86881c4f93c Fix directional object matrix error

[Bf-blender-cvs] [6b005517db9] soc-2018-npr: Normal controlled normal thickness for software is ok. No direction and position variation.

Commit: 6b005517db982b3036d86a5cdbb8ab91abc598f2 Author: Nick Wu Date: Tue Aug 28 15:48:01 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB6b005517db982b3036d86a5cdbb8ab91abc598f2 Normal controlled normal thickness for software is ok. No direction and position variation

[Bf-blender-cvs] [0b758fd9948] soc-2018-npr: Software normal control thickness for non-chain situation

Commit: 0b758fd9948fe6c456fccc1596fcd587c9e1184e Author: Nick Wu Date: Tue Aug 28 14:13:57 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB0b758fd9948fe6c456fccc1596fcd587c9e1184e Software normal control thickness for non-chain situation

[Bf-blender-cvs] [db66c3a9a2f] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: db66c3a9a2feb49b1fee35d3984099dab966057b Author: Nick Wu Date: Tue Aug 28 12:46:50 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBdb66c3a9a2feb49b1fee35d3984099dab966057b Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [5d21c3089df] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 5d21c3089dfe03479daefad1217428c9f1bf3bf6 Author: Nick Wu Date: Sun Aug 26 10:28:55 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB5d21c3089dfe03479daefad1217428c9f1bf3bf6 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [fba6d689150] soc-2018-npr: Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

Commit: fba6d689150ba6a584a6b3b8bb04c02c13563b55 Author: Nick Wu Date: Sun Aug 26 20:13:30 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBfba6d689150ba6a584a6b3b8bb04c02c13563b55 Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

[Bf-blender-cvs] [8e58b88ea43] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 8e58b88ea432cca8548fc85b0390a2a688e4c120 Author: Nick Wu Date: Thu Aug 23 18:55:32 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB8e58b88ea432cca8548fc85b0390a2a688e4c120 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [4b763f4cb2e] soc-2018-npr: Fixing perpective flag

Commit: 4b763f4cb2e7a80d0bbaf3bb26f717ef39a72882 Author: Nick Wu Date: Thu Aug 23 18:53:37 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4b763f4cb2e7a80d0bbaf3bb26f717ef39a72882 Fixing perpective flag === M

[Bf-blender-cvs] [7aa1c544f73] soc-2018-npr: Fix opensubdiv error when not enabled WITH_OPENSUBDIV

Commit: 7aa1c544f73e430ee50849cabd31a59b5acbf4de Author: Nick Wu Date: Tue Aug 14 16:20:19 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB7aa1c544f73e430ee50849cabd31a59b5acbf4de Fix opensubdiv error when not enabled WITH_OPENSUBDIV

[Bf-blender-cvs] [dc03876c7bd] soc-2018-npr: Fixed engine compatible panel for camera and speaker data.

Commit: dc03876c7bd2f81ce8b951b58feecd69fc51bfd8 Author: Nick Wu Date: Tue Aug 14 13:44:04 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBdc03876c7bd2f81ce8b951b58feecd69fc51bfd8 Fixed engine compatible panel for camera and speaker data

[Bf-blender-cvs] [0b75e68500f] soc-2018-npr: Fixed lanpr field always NULL error. (caused by depsgraph scene copy)

Commit: 0b75e68500f6eda1c3e92667b3bdaa8bf1a1026b Author: Nick Wu Date: Tue Aug 14 13:39:44 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB0b75e68500f6eda1c3e92667b3bdaa8bf1a1026b Fixed lanpr field always NULL error. (caused by depsgraph scene copy

[Bf-blender-cvs] [18cc07076d9] soc-2018-npr: Fixed taper on software side, merged tess modifier's osd adapter.

Commit: 18cc07076d9995a96e5b86a768950198a0c2658a Author: Nick Wu Date: Fri Aug 10 17:12:17 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB18cc07076d9995a96e5b86a768950198a0c2658a Fixed taper on software side, merged tess modifier's osd adapter

[Bf-blender-cvs] [cefcf402cbe] soc-2018-npr: Fixed taper on software side

Commit: cefcf402cbe353a964dc5b06ffc9b0aadc261491 Author: Nick Wu Date: Fri Aug 10 17:13:57 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBcefcf402cbe353a964dc5b06ffc9b0aadc261491 Fixed taper on software side

[Bf-blender-cvs] [251dbabdf13] soc-2018-npr: Fixed enum in modifier IDs (npr tess modifier and a merged new one)

Commit: 251dbabdf13bccae2264bffdc13b0f9133eccaa8 Author: Nick Wu Date: Fri Aug 10 16:18:31 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB251dbabdf13bccae2264bffdc13b0f9133eccaa8 Fixed enum in modifier IDs (npr tess modifier and a merged new one

[Bf-blender-cvs] [2d01210ea7f] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 2d01210ea7f15838b139dd6c042f683033fe4bf8 Author: Nick Wu Date: Fri Aug 10 15:56:46 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB2d01210ea7f15838b139dd6c042f683033fe4bf8 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [83c85c9c985] soc-2018-npr: Fixed shader variable naming style issue.

Commit: 83c85c9c985e82c2437a64ab540b26d7f8cce3af Author: Nick Wu Date: Fri Aug 10 15:51:08 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB83c85c9c985e82c2437a64ab540b26d7f8cce3af Fixed shader variable naming style issue

[Bf-blender-cvs] [89e9c1405c6] soc-2018-npr: Python panel engine adaptations

Commit: 89e9c1405c68b94e11013954a8f3d853ceb5dc4a Author: Nick Wu Date: Fri Aug 10 15:36:02 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB89e9c1405c68b94e11013954a8f3d853ceb5dc4a Python panel engine adaptations

[Bf-blender-cvs] [4d7d0b60d1f] soc-2018-npr: Modified UI for background color display and line layer on DPIX. Added console warning for software rendering.

Commit: 4d7d0b60d1f54219166c618d72d7725ccb058f59 Author: Nick Wu Date: Thu Aug 9 15:41:10 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4d7d0b60d1f54219166c618d72d7725ccb058f59 Modified UI for background color display and line layer on DPIX. Added console warning

[Bf-blender-cvs] [ca07177f5b0] soc-2018-npr: Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

Commit: ca07177f5b07750ff6f5d9a14c0d5ca458125515 Author: Nick Wu Date: Wed Aug 8 21:55:54 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBca07177f5b07750ff6f5d9a14c0d5ca458125515 Merge branch 'npr_tess' of https://github.com/DarkDefender/blender into soc-2018-npr

[Bf-blender-cvs] [d9b0c6711ed] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: d9b0c6711ed65b5ba2c59ac1ddb9555067d69c0e Author: Nick Wu Date: Tue Aug 7 19:57:07 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBd9b0c6711ed65b5ba2c59ac1ddb9555067d69c0e Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [80e3a977442] soc-2018-npr: Adapted shader APIs to DRW_

Commit: 80e3a977442214cc63a4ce28cb5d8404a62b733a Author: Nick Wu Date: Sat Aug 4 09:53:03 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB80e3a977442214cc63a4ce28cb5d8404a62b733a Adapted shader APIs to DRW_

[Bf-blender-cvs] [356dc7892bf] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 356dc7892bfb08a22dc527b410527033e2cff877 Author: Nick Wu Date: Sat Aug 4 09:34:15 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB356dc7892bfb08a22dc527b410527033e2cff877 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [44f0f142326] soc-2018-npr: Fixed software triangle and render line culling bug. (crappy, but works correctly)

Commit: 44f0f1423264f6ad8249325f5c41f1c83bdc565d Author: Nick Wu Date: Wed Aug 1 23:19:44 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB44f0f1423264f6ad8249325f5c41f1c83bdc565d Fixed software triangle and render line culling bug. (crappy, but works correctly

[Bf-blender-cvs] [d2f77ce653c] soc-2018-npr: Uncrustify processed.

Commit: d2f77ce653cf0daac253328675536dc61132f142 Author: Nick Wu Date: Wed Aug 1 20:29:17 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBd2f77ce653cf0daac253328675536dc61132f142 Uncrustify processed. === M

[Bf-blender-cvs] [7866c2fb05e] soc-2018-npr: potentially fixed drawing command conflict error in F12

Commit: 7866c2fb05e6cb90f651fada81336f18842def9d Author: Nick Wu Date: Wed Aug 1 18:50:08 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB7866c2fb05e6cb90f651fada81336f18842def9d potentially fixed drawing command conflict error in F12

[Bf-blender-cvs] [64c25782286] soc-2018-npr: Fixed software rendering intersection cache update

Commit: 64c257822862742cff1aace99123f568d6834c37 Author: Nick Wu Date: Wed Aug 1 16:19:34 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB64c257822862742cff1aace99123f568d6834c37 Fixed software rendering intersection cache update

[Bf-blender-cvs] [3b36c698cd1] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 3b36c698cd13ff01cd718ad633070eaef15fdc2c Author: Nick Wu Date: Wed Aug 1 10:15:47 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB3b36c698cd13ff01cd718ad633070eaef15fdc2c Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [9b06c78676a] soc-2018-npr: Adapted multisample functions.

Commit: 9b06c78676ad170d971a0f69ddd4e48c10b0db79 Author: Nick Wu Date: Wed Aug 1 12:08:05 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB9b06c78676ad170d971a0f69ddd4e48c10b0db79 Adapted multisample functions

[Bf-blender-cvs] [002712d04c3] soc-2018-npr: Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr

Commit: 002712d04c356924b17e0cc71d28a552ea2f8a97 Author: Nick Wu Date: Mon Jul 30 23:20:28 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB002712d04c356924b17e0cc71d28a552ea2f8a97 Merge branch 'soc-2018-npr' of git.blender.org:blender into soc-2018-npr # Conflicts

[Bf-blender-cvs] [927c7aae0dd] soc-2018-npr: Added init code for default LANPR values. Fixed render and scene panels to accept LANPR engine.

Commit: 927c7aae0dd074792009c0b0c9f3df2e630dcddc Author: Nick Wu Date: Mon Jul 30 23:19:17 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB927c7aae0dd074792009c0b0c9f3df2e630dcddc Added init code for default LANPR values. Fixed render and scene panels to accept LANPR engine

[Bf-blender-cvs] [67d1949c5bb] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 67d1949c5bb87f284485358cb3da5f422aab2dfa Author: Nick Wu Date: Mon Jul 30 18:27:46 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB67d1949c5bb87f284485358cb3da5f422aab2dfa Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [63921c65e94] soc-2018-npr: changed most of the list API into BLI_'s. Removed many unused functions

Commit: 63921c65e9480b8004c2807a96fa8cc3835dc1d8 Author: Nick Wu Date: Mon Jul 30 18:26:15 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB63921c65e9480b8004c2807a96fa8cc3835dc1d8 changed most of the list API into BLI_'s. Removed many unused functions

[Bf-blender-cvs] [9218730b2b3] soc-2018-npr: DPIX and Snake's F12 is working now.

Commit: 9218730b2b313147ed0dc424bcb23575139dfbc1 Author: Nick Wu Date: Fri Jul 27 18:17:18 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB9218730b2b313147ed0dc424bcb23575139dfbc1 DPIX and Snake's F12 is working now

[Bf-blender-cvs] [4ef26d98d33] soc-2018-npr: Fixed intersection calculation memory leak, fixed snake UI error, added F12 supporting functions.

Commit: 4ef26d98d33d026f010da27d97dd0929023589ba Author: Nick Wu Date: Fri Jul 27 11:37:14 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4ef26d98d33d026f010da27d97dd0929023589ba Fixed intersection calculation memory leak, fixed snake UI error, added F12 supporting functions

[Bf-blender-cvs] [e941813e3c8] soc-2018-npr: Debugging small problem in threads, in lanpr_triangle_line_imagespace_intersection_v2()

Commit: e941813e3c8bace99db02eec9fc39c58e852a527 Author: Nick Wu Date: Fri Jul 27 15:53:13 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBe941813e3c8bace99db02eec9fc39c58e852a527 Debugging small problem in threads, in lanpr_triangle_line_imagespace_intersection_v2

[Bf-blender-cvs] [68374d38381] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 68374d38381ba597504c1cba4b303d0b336e6c81 Author: Nick Wu Date: Thu Jul 26 10:09:40 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB68374d38381ba597504c1cba4b303d0b336e6c81 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [d250cd950b7] soc-2018-npr: Typo fix finalColor

Commit: d250cd950b7d0fcaae71759e9140e7a1b998d38b Author: Nick Wu Date: Wed Jul 25 22:49:14 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBd250cd950b7d0fcaae71759e9140e7a1b998d38b Typo fix finalColor === M

[Bf-blender-cvs] [dd5fcd4d0f9] soc-2018-npr: Fix camera access error, added report to no camera situation.

Commit: dd5fcd4d0f9e4da98bf6c46d6a87b2ead0709b4c Author: Nick Wu Date: Wed Jul 25 22:25:18 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBdd5fcd4d0f9e4da98bf6c46d6a87b2ead0709b4c Fix camera access error, added report to no camera situation

[Bf-blender-cvs] [3353221166b] soc-2018-npr: Fix code for strict compile.

Commit: 3353221166b09083e875b9d3d4b95a523b115e08 Author: Nick Wu Date: Wed Jul 25 22:15:18 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB3353221166b09083e875b9d3d4b95a523b115e08 Fix code for strict compile

[Bf-blender-cvs] [ea8f7878f6c] soc-2018-npr: Added debug shaders to find problems in f12

Commit: ea8f7878f6cad888c0e1491d2f243874178e21dc Author: Nick Wu Date: Wed Jul 25 16:39:58 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBea8f7878f6cad888c0e1491d2f243874178e21dc Added debug shaders to find problems in f12

[Bf-blender-cvs] [88448dba155] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 88448dba155453fd265c228b3970d1eb86f1e101 Author: Nick Wu Date: Wed Jul 25 13:43:14 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB88448dba155453fd265c228b3970d1eb86f1e101 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [7fa715cfb76] soc-2018-npr: Modified UI for chaining.

Commit: 7fa715cfb76c23f82a9d695fa1a6d07e9a162215 Author: Nick Wu Date: Tue Jul 24 16:57:29 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB7fa715cfb76c23f82a9d695fa1a6d07e9a162215 Modified UI for chaining. === M

[Bf-blender-cvs] [483d5d7c936] soc-2018-npr: Fixed c function and glsl file names.

Commit: 483d5d7c9363cebd43524a4559748bfea0a73fb8 Author: Nick Wu Date: Tue Jul 24 15:30:06 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB483d5d7c9363cebd43524a4559748bfea0a73fb8 Fixed c function and glsl file names

[Bf-blender-cvs] [3f7d07ac971] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: 3f7d07ac971088efc5ce51c586f1940e6d12ded5 Author: Nick Wu Date: Tue Jul 24 10:12:03 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB3f7d07ac971088efc5ce51c586f1940e6d12ded5 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Bf-blender-cvs] [1ddd3d60bff] soc-2018-npr: Chain support line types and levels. Still bugs in chaining, hard to find, but results good enough in most of the conditions.

Commit: 1ddd3d60bff06729f3bc08544ab8a9392db5ca12 Author: Nick Wu Date: Mon Jul 23 17:57:34 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB1ddd3d60bff06729f3bc08544ab8a9392db5ca12 Chain support line types and levels. Still bugs in chaining, hard to find, but results good

[Bf-blender-cvs] [e406c678424] soc-2018-npr: Provide a switch to enable chaining or not.

Commit: e406c67842479a78b8904671a8e9729fc8a505c7 Author: Nick Wu Date: Mon Jul 23 22:33:59 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBe406c67842479a78b8904671a8e9729fc8a505c7 Provide a switch to enable chaining

[Bf-blender-cvs] [9f344c6b887] soc-2018-npr: Merge and changed GWN APIs into GPU ones.

Commit: 9f344c6b887306b42156279deffb5112f88757d1 Author: Nick Wu Date: Mon Jul 23 11:34:30 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB9f344c6b887306b42156279deffb5112f88757d1 Merge and changed GWN APIs into GPU ones

[Bf-blender-cvs] [aa6563d3a9b] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

Commit: aa6563d3a9bd46fd170b6ae493d8db885d2422b7 Author: Nick Wu Date: Mon Jul 23 10:55:48 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBaa6563d3a9bd46fd170b6ae493d8db885d2422b7 Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr # Conflicts

[Bf-blender-cvs] [67fa286f115] soc-2018-npr: Fix render triangle size increment error.

Commit: 67fa286f115e0a38736f0582e4c7e995f307a564 Author: Nick Wu Date: Fri Jul 20 23:27:28 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB67fa286f115e0a38736f0582e4c7e995f307a564 Fix render triangle size increment error

[Bf-blender-cvs] [efe7257a203] soc-2018-npr: Fix detail reducing bugs

Commit: efe7257a203fddc43d6e0781f8f4248900602438 Author: Nick Wu Date: Fri Jul 20 22:14:02 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBefe7257a203fddc43d6e0781f8f4248900602438 Fix detail reducing bugs === M

[Bf-blender-cvs] [227c2598733] soc-2018-npr: Fix fileread error again.

Commit: 227c2598733ee4c0f32e7a2310881ecf7e388d0c Author: Nick Wu Date: Fri Jul 20 22:41:39 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB227c2598733ee4c0f32e7a2310881ecf7e388d0c Fix fileread error again. === M

[Bf-blender-cvs] [b3cea139a8a] soc-2018-npr: Fix taper on segment_count==1 situation

Commit: b3cea139a8aee0ebdd9cce44f08ac71f1557b227 Author: Nick Wu Date: Fri Jul 20 22:26:32 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBb3cea139a8aee0ebdd9cce44f08ac71f1557b227 Fix taper on segment_count==1 situation

[Bf-blender-cvs] [b421eaa36d8] soc-2018-npr: Chain first level preview ok. Simplification have bugs.

Commit: b421eaa36d88d38988165176fe07a85b91edb7cd Author: Nick Wu Date: Fri Jul 20 21:06:36 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBb421eaa36d88d38988165176fe07a85b91edb7cd Chain first level preview ok. Simplification have bugs

[Bf-blender-cvs] [aceecd17499] soc-2018-npr: Intersection chain now ok. (occlude level debug wait until tomorrow)

Commit: aceecd17499c854f34689e65ccd322e19e54055e Author: Nick Wu Date: Thu Jul 19 23:44:30 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rBaceecd17499c854f34689e65ccd322e19e54055e Intersection chain now ok. (occlude level debug wait until tomorrow

[Bf-blender-cvs] [8bb97b6318f] soc-2018-npr: Fixed not updating normal error. now all lines properly calculated.

Commit: 8bb97b6318f86da86a6e0f99d9356cdb24bf1db8 Author: Nick Wu Date: Thu Jul 19 15:50:50 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB8bb97b6318f86da86a6e0f99d9356cdb24bf1db8 Fixed not updating normal error. now all lines properly calculated

[Bf-blender-cvs] [4719b8f5613] soc-2018-npr: Fix occlusion error

Commit: 4719b8f561357d91b33a29f38a8d2a78048cd99b Author: Nick Wu Date: Thu Jul 19 13:51:01 2018 +0800 Branches: soc-2018-npr https://developer.blender.org/rB4719b8f561357d91b33a29f38a8d2a78048cd99b Fix occlusion error === M

  1   2   3   >