http://www.miikahweb.com/feed.php MiikaHweb - Blender Soc-2018-npr Branch http://www.miikahweb.com/ MiikaHweb - Blender Soc-2018-npr Branch fi Mon, 19 Aug 19 00:02:27 +0000 MiikaHweb RSS contact at miikahweb.com <![CDATA[[46866fb]: Solve merge errors in shader calls.]]> http://www.miikahweb.com/en/blender/git-logs/commit/46866fb907b9379b35522d877e97cea1f230d4b8 46866fb
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Solve merge errors in shader calls.

----------------------------------------
3 Paths Changed]]>
Thu, 16 May 2019 02:03:21 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/46866fb907b9379b35522d877e97cea1f230d4b8YimingWu
<![CDATA[[5480411]: Merge branch 'master' into soc-2018-npr]]> http://www.miikahweb.com/en/blender/git-logs/commit/54804117e89931a1e7bfa67b2aaf4fe237881ab6 5480411
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Thu, 16 May 2019 01:48:45 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/54804117e89931a1e7bfa67b2aaf4fe237881ab6YimingWu
<![CDATA[[2753611]: Merge branch 'master' into soc-2018-npr]]> http://www.miikahweb.com/en/blender/git-logs/commit/2753611c4e2482885021416f1b2af46250fd09dd 2753611
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Mon, 06 May 2019 02:09:12 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2753611c4e2482885021416f1b2af46250fd09ddYimingWu
<![CDATA[[efcc83a]: Merge branch 'master' into soc-2018-npr]]> http://www.miikahweb.com/en/blender/git-logs/commit/efcc83a07d737c84defb57a11c1549abba92f58d efcc83a
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Mon, 22 Apr 2019 01:46:20 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/efcc83a07d737c84defb57a11c1549abba92f58dYimingWu
<![CDATA[[fbb5edf]: Merge branch 'master' into soc-2018-npr]]> http://www.miikahweb.com/en/blender/git-logs/commit/fbb5edf974f87894baa2cfd1a36878d5dce5be01 fbb5edf
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr

# Conflicts:
# source/blender/blenloader/intern/readfile.c

----------------------------------------
0 Paths Changed]]>
Wed, 24 Apr 2019 03:00:23 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/fbb5edf974f87894baa2cfd1a36878d5dce5be01YimingWu
<![CDATA[[2c5bce2]: Merge branch 'master' into soc-2018-npr Fix errors]]> http://www.miikahweb.com/en/blender/git-logs/commit/2c5bce2300193ac7060f4aca73caee53e8a10233 2c5bce2
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr Fix errors

# Conflicts:
# intern/opensubdiv/internal/opensubdiv_evaluator.cc
# intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
# release/scripts/startup/bl_ui/properties_data_modifier.py
# source/blender/CMakeLists.txt
# source/blender/blenkernel/intern/scene.c
# source/blender/blenloader/intern/readfile.c
# source/blender/blenloader/intern/versioning_280.c
# source/blender/blenloader/intern/writefile.c
# source/blender/bmesh/intern/bmesh_polygon.c
# source/blender/draw/CMakeLists.txt
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/modes/object_mode.c
# source/blender/editors/mesh/editmesh_tools.c
# source/blender/editors/mesh/mesh_ops.c
# source/blender/editors/render/render_intern.h
# source/blender/editors/render/render_ops.c
# source/blender/editors/space_outliner/outliner_draw.c
# source/blender/editors/space_view3d/space_view3d.c
# source/blender/makesdna/DNA_light_types.h
# source/blender/makesdna/DNA_modifier_types.h
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesdna/intern/makesdna.c
# source/blender/makesrna/intern/CMakeLists.txt
# source/blender/makesrna/intern/makesrna.c
# source/blender/makesrna/intern/rna_modifier.c
# source/blender/makesrna/intern/rna_scene.c
# source/blender/modifiers/CMakeLists.txt
# source/blender/modifiers/intern/MOD_util.c

----------------------------------------
0 Paths Changed]]>
Sat, 20 Apr 2019 06:10:24 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/2c5bce2300193ac7060f4aca73caee53e8a10233YimingWu
<![CDATA[[11229c4]: Merge branch 'master' into soc-2018-npr]]> http://www.miikahweb.com/en/blender/git-logs/commit/11229c4d413720f3658225e3d44329434befa90a 11229c4
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Fri, 12 Apr 2019 08:33:02 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/11229c4d413720f3658225e3d44329434befa90aYimingWu
<![CDATA[[f1470a8]: Fix modifier api]]> http://www.miikahweb.com/en/blender/git-logs/commit/f1470a84f88cabaeec6f197a50ae9864c9a66bfb f1470a8
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fix modifier api

----------------------------------------
1 Path Changed]]>
Thu, 04 Apr 2019 13:57:00 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/f1470a84f88cabaeec6f197a50ae9864c9a66bfbYimingWu
<![CDATA[[47495f6]: Fix errors]]> http://www.miikahweb.com/en/blender/git-logs/commit/47495f6f092f5282135c31152ed8c24eac83ae42 47495f6
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fix errors

----------------------------------------
7 Paths Changed]]>
Thu, 04 Apr 2019 12:33:16 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/47495f6f092f5282135c31152ed8c24eac83ae42YimingWu
<![CDATA[[525c903]: Merge remote-tracking branch 'origin/master' into soc-2018-...]]> http://www.miikahweb.com/en/blender/git-logs/commit/525c9034cd77e22d9307f3813c47a314269dda73 525c903
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge remote-tracking branch 'origin/master' into soc-2018-npr

# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_scene.py
# source/blender/draw/intern/draw_manager_texture.c
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools

----------------------------------------
0 Paths Changed]]>
Thu, 04 Apr 2019 11:14:41 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/525c9034cd77e22d9307f3813c47a314269dda73YimingWu
<![CDATA[[92a33e4]: Merge remote-tracking branch 'origin/master' into soc-2018-...]]> http://www.miikahweb.com/en/blender/git-logs/commit/92a33e459984757cfe86f8f1245aa36caa7c78a5 92a33e4
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge remote-tracking branch 'origin/master' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Thu, 04 Apr 2019 12:33:44 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/92a33e459984757cfe86f8f1245aa36caa7c78a5YimingWu
<![CDATA[[a08bf33]: Type error]]> http://www.miikahweb.com/en/blender/git-logs/commit/a08bf336f5425d81bacbc8fbfa77bca209de8a93 a08bf33
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Type error

----------------------------------------
1 Path Changed]]>
Fri, 08 Mar 2019 11:58:41 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a08bf336f5425d81bacbc8fbfa77bca209de8a93YimingWu
<![CDATA[[c46ce1b]: Merge changes]]> http://www.miikahweb.com/en/blender/git-logs/commit/c46ce1bc817c67d8b2f4ee945ad992a84b2f3095 c46ce1b
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge changes

----------------------------------------
8 Paths Changed]]>
Fri, 08 Mar 2019 11:39:02 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/c46ce1bc817c67d8b2f4ee945ad992a84b2f3095YimingWu
<![CDATA[[26fc7ef]: Merge branch 'master' into soc-2018-npr]]> http://www.miikahweb.com/en/blender/git-logs/commit/26fc7ef55f1584bcf9fd262419f1a3f540c186af 26fc7ef
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr

# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/draw/intern/DRW_render.h
# source/blender/makesdna/DNA_light_types.h
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools

----------------------------------------
0 Paths Changed]]>
Fri, 08 Mar 2019 11:12:37 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/26fc7ef55f1584bcf9fd262419f1a3f540c186afYimingWu
<![CDATA[[0ed5552]: Merge remote-tracking branch 'origin/master' into soc-2018-...]]> http://www.miikahweb.com/en/blender/git-logs/commit/0ed55524f150003a0121c4e7e5f5c26c52184e00 0ed5552
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge remote-tracking branch 'origin/master' into soc-2018-npr

# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools

----------------------------------------
0 Paths Changed]]>
Sat, 05 Jan 2019 09:29:09 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/0ed55524f150003a0121c4e7e5f5c26c52184e00YimingWu
<![CDATA[[8d78a25]: Fixed clipping distance calculation, but clip plane triangle...]]> http://www.miikahweb.com/en/blender/git-logs/commit/8d78a25ef493fcd7653e9c9dc57468edd666040c 8d78a25
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fixed clipping distance calculation, but clip plane triangle cutting still have problems.

----------------------------------------
1 Path Changed]]>
Wed, 02 Jan 2019 08:09:01 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/8d78a25ef493fcd7653e9c9dc57468edd666040cYimingWu
<![CDATA[[907ea48]: Fixed intersection missings when bounding area separation occurs...]]> http://www.miikahweb.com/en/blender/git-logs/commit/907ea48a52add5189c3eef0c365a8c92f7ffcda7 907ea48
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fixed intersection missings when bounding area separation occurs.

----------------------------------------
1 Path Changed]]>
Sun, 30 Dec 2018 03:28:36 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/907ea48a52add5189c3eef0c365a8c92f7ffcda7YimingWu
<![CDATA[[fd49ce1]: Fixed hidden multi-thread error.]]> http://www.miikahweb.com/en/blender/git-logs/commit/fd49ce1d7b5866c498c1c9002ef98320d64d6907 fd49ce1
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fixed hidden multi-thread error.

----------------------------------------
1 Path Changed]]>
Sat, 29 Dec 2018 13:31:32 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/fd49ce1d7b5866c498c1c9002ef98320d64d6907YimingWu
<![CDATA[[5ded8bc]: Fix triangle-point test function for a stupid condition. See...]]> http://www.miikahweb.com/en/blender/git-logs/commit/5ded8bc95ff82c465759d73dbd0678f4bc686a90 5ded8bc
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fix triangle-point test function for a stupid condition. See comment.

----------------------------------------
1 Path Changed]]>
Sat, 29 Dec 2018 07:05:41 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/5ded8bc95ff82c465759d73dbd0678f4bc686a90YimingWu
<![CDATA[[628ff9b]: make rendering into a loop to avoid callback stack overflow.]]> http://www.miikahweb.com/en/blender/git-logs/commit/628ff9b3d6bce835e97c4616e9296df7043689a1 628ff9b
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
make rendering into a loop to avoid callback stack overflow.

----------------------------------------
1 Path Changed]]>
Sat, 29 Dec 2018 05:04:22 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/628ff9b3d6bce835e97c4616e9296df7043689a1YimingWu
<![CDATA[[a531f85]: remove INVOKE_DEFAULT for rendering, otherwise still cause...]]> http://www.miikahweb.com/en/blender/git-logs/commit/a531f8528b7dde0a9b960ed735fec2c1cd692d22 a531f85
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
remove INVOKE_DEFAULT for rendering, otherwise still cause trouble on windows.

----------------------------------------
1 Path Changed]]>
Sat, 29 Dec 2018 04:28:10 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a531f8528b7dde0a9b960ed735fec2c1cd692d22YimingWu
<![CDATA[[a3b17a6]: Fix scripts from external editings.]]> http://www.miikahweb.com/en/blender/git-logs/commit/a3b17a6c71d78cb7acf8e402c4a80446d48a2e28 a3b17a6
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fix scripts from external editings.

----------------------------------------
2 Paths Changed]]>
Fri, 28 Dec 2018 13:49:50 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a3b17a6c71d78cb7acf8e402c4a80446d48a2e28YimingWu
<![CDATA[[7d60b14]: Added one click composition to LANPR.]]> http://www.miikahweb.com/en/blender/git-logs/commit/7d60b1467624cde7256c3f12c60ef735fd1d2000 7d60b14
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Added one click composition to LANPR.

----------------------------------------
5 Paths Changed]]>
Fri, 28 Dec 2018 13:20:19 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7d60b1467624cde7256c3f12c60ef735fd1d2000YimingWu
<![CDATA[[61d3c12]: Merge remote-tracking branch 'remotes/origin/blender2.8' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/61d3c1261c5d9e40c41ae540b83952e411670fe8 61d3c12
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Sun, 23 Dec 2018 11:09:42 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/61d3c1261c5d9e40c41ae540b83952e411670fe8
<![CDATA[[644cd00]: Merge branch 'blender2.8' of git://git.blender.org/blender]]> http://www.miikahweb.com/en/blender/git-logs/commit/644cd00d1a647eb1e55263722997544a1a2cc91e 644cd00
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Merge branch 'blender2.8' of git://git.blender.org/blender

----------------------------------------
0 Paths Changed]]>
Mon, 30 Apr 2018 00:58:47 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/644cd00d1a647eb1e55263722997544a1a2cc91e
<![CDATA[[90875f7]: Merge remote-tracking branch 'origin/blender2.8' into soc-2018...]]> http://www.miikahweb.com/en/blender/git-logs/commit/90875f7d94ac477a4b7a0c5a22f06012b917c348 90875f7
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/blender/makesdna/DNA_lamp_types.h
# source/blender/makesdna/DNA_scene_types.h

----------------------------------------
0 Paths Changed]]>
Tue, 18 Dec 2018 03:56:01 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/90875f7d94ac477a4b7a0c5a22f06012b917c348YimingWu
<![CDATA[[be0628b]: Merge branch 'master' into soc-2018-npr]]> http://www.miikahweb.com/en/blender/git-logs/commit/be0628b743462b7606109dccec2e1d93e51dba0d be0628b
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge branch 'master' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Fri, 28 Dec 2018 02:59:36 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/be0628b743462b7606109dccec2e1d93e51dba0dYimingWu
<![CDATA[[1d4ea9d]: Fix smooth contour modifier for API changes]]> http://www.miikahweb.com/en/blender/git-logs/commit/1d4ea9d881a9efd1d92a9fbf5ffee74b14ff7825 1d4ea9d
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fix smooth contour modifier for API changes

----------------------------------------
1 Path Changed]]>
Fri, 14 Dec 2018 06:57:51 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/1d4ea9d881a9efd1d92a9fbf5ffee74b14ff7825YimingWu
<![CDATA[[39f22cc]: Merge remote-tracking branch 'origin/blender2.8' into soc-2018...]]> http://www.miikahweb.com/en/blender/git-logs/commit/39f22cc8570223e7256763576eab9f1c6309f115 39f22cc
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/blender/makesrna/intern/rna_scene.c

----------------------------------------
0 Paths Changed]]>
Fri, 14 Dec 2018 06:47:39 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/39f22cc8570223e7256763576eab9f1c6309f115YimingWu
<![CDATA[[f1222d6]: Resume default contour detection method.]]> http://www.miikahweb.com/en/blender/git-logs/commit/f1222d611509a8ec7e377b5121c029c2fce5b6e3 f1222d6
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Resume default contour detection method.

----------------------------------------
1 Path Changed]]>
Wed, 12 Dec 2018 13:22:51 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/f1222d611509a8ec7e377b5121c029c2fce5b6e3YimingWu
<![CDATA[[feb24c1]: Fix accidental merge error]]> http://www.miikahweb.com/en/blender/git-logs/commit/feb24c13b942f2500dfc4ca4aa4dc98474f651c0 feb24c1
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Fix accidental merge error

----------------------------------------
1 Path Changed]]>
Fri, 14 Dec 2018 06:46:43 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/feb24c13b942f2500dfc4ca4aa4dc98474f651c0YimingWu
<![CDATA[[a33a3df]: Merge remote-tracking branch 'origin/blender2.8' into soc-2018...]]> http://www.miikahweb.com/en/blender/git-logs/commit/a33a3dfd7434a7637de2613f41358f7bb8f4f37b a33a3df
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr

# Conflicts:
# source/blender/makesdna/DNA_scene_types.h

----------------------------------------
0 Paths Changed]]>
Wed, 12 Dec 2018 11:02:58 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a33a3dfd7434a7637de2613f41358f7bb8f4f37bYimingWu
<![CDATA[[54443b6]: Fix merge errors.]]> http://www.miikahweb.com/en/blender/git-logs/commit/54443b6d900bd3ebd4dd848c0e2f94ba95f8cdad 54443b6
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Fix merge errors.

----------------------------------------
2 Paths Changed]]>
Sat, 08 Dec 2018 14:55:29 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/54443b6d900bd3ebd4dd848c0e2f94ba95f8cdad
<![CDATA[[9fc81d8]: Merge remote-tracking branch 'origin/blender2.8' into soc-2018...]]> http://www.miikahweb.com/en/blender/git-logs/commit/9fc81d8cea36a3d9a6862ac469b8973aaec703d1 9fc81d8
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : YimingWu (NicksBest)
----------------------------------------
Merge remote-tracking branch 'origin/blender2.8' into soc-2018-npr

# Conflicts:
# release/scripts/addons_contrib
# release/scripts/startup/bl_ui/properties_data_camera.py
# release/scripts/startup/bl_ui/properties_material.py
# release/scripts/startup/bl_ui/properties_particle.py
# release/scripts/startup/bl_ui/properties_physics_common.py
# release/scripts/startup/bl_ui/properties_physics_rigidbody.py
# release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
# release/scripts/startup/bl_ui/properties_physics_softbody.py
# release/scripts/startup/bl_ui/properties_scene.py
# release/scripts/startup/bl_ui/properties_view_layer.py
# release/scripts/startup/bl_ui/properties_world.py
# source/blender/draw/intern/draw_manager.c
# source/blender/makesrna/intern/rna_scene.c

----------------------------------------
0 Paths Changed]]>
Fri, 07 Dec 2018 14:53:30 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/9fc81d8cea36a3d9a6862ac469b8973aaec703d1YimingWu
<![CDATA[[a1a526e]: added example functions for accessing LANPR occlusion data]]> http://www.miikahweb.com/en/blender/git-logs/commit/a1a526e5576384aade7aec3d66ed00886911d337 a1a526e
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
added example functions for accessing LANPR occlusion data

----------------------------------------
2 Paths Changed]]>
Mon, 26 Nov 2018 13:47:11 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/a1a526e5576384aade7aec3d66ed00886911d337
<![CDATA[[13a654d]: Merge remote-tracking branch 'remotes/origin/blender2.8' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/13a654d0f3f33a6da9e59cbe10911978a70fb49c 13a654d
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Wed, 14 Nov 2018 03:34:27 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/13a654d0f3f33a6da9e59cbe10911978a70fb49c
<![CDATA[[3c7da86]: Merge remote-tracking branch 'remotes/origin/blender2.8' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/3c7da86849fecfe099b07b9f9a9869cb57111b3f 3c7da86
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/makesdna/DNA_lamp_types.h

----------------------------------------
0 Paths Changed]]>
Mon, 19 Nov 2018 04:51:52 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/3c7da86849fecfe099b07b9f9a9869cb57111b3f
<![CDATA[[7a34d16]: Merge remote-tracking branch 'remotes/origin/blender2.8' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/7a34d16d7a11561de621d0bd16b54a0ffea4d744 7a34d16
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

----------------------------------------
0 Paths Changed]]>
Sun, 21 Oct 2018 06:16:32 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/7a34d16d7a11561de621d0bd16b54a0ffea4d744
<![CDATA[[821aa86]: Merge remote-tracking branch 'remotes/origin/blender2.8' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/821aa86d98784a529bc80820d7e7164a04eb2fce 821aa86
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# release/scripts/startup/bl_ui/properties_scene.py

----------------------------------------
0 Paths Changed]]>
Wed, 14 Nov 2018 03:32:17 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/821aa86d98784a529bc80820d7e7164a04eb2fce
<![CDATA[[b77c6a8]: Merge remote-tracking branch 'remotes/origin/blender2.8' into...]]> http://www.miikahweb.com/en/blender/git-logs/commit/b77c6a859ec62139e079003b0ac2a4458620d521 b77c6a8
Branches : greasepencil-object, soc-2018-npr, soc-2019-npr
Author : Unknown ()
----------------------------------------
Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/makesdna/DNA_scene_types.h
# source/tools

----------------------------------------
0 Paths Changed]]>
Wed, 31 Oct 2018 05:45:08 +0000 http://www.miikahweb.com/en/blender/git-logs/commit/b77c6a859ec62139e079003b0ac2a4458620d521