Blender Git Commits

Blender Git "soc-2018-npr" branch commits.

May 16, 2019, 02:03 (GMT)
Solve merge errors in shader calls.
May 16, 2019, 01:48 (GMT)
Merge branch 'master' into soc-2018-npr
May 6, 2019, 02:09 (GMT)
Merge branch 'master' into soc-2018-npr
April 24, 2019, 03:00 (GMT)
Merge branch 'master' into soc-2018-npr

# Conflicts:
# source/blender/blenloader/intern/readfile.c
April 22, 2019, 01:46 (GMT)
Merge branch 'master' into soc-2018-npr
April 20, 2019, 06:10 (GMT)
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
April 12, 2019, 08:33 (GMT)
Merge branch 'master' into soc-2018-npr
April 4, 2019, 13:57 (GMT)
Fix modifier api
April 4, 2019, 12:33 (GMT)
Merge remote-tracking branch 'origin/master' into soc-2018-npr
April 4, 2019, 12:33 (GMT)
Fix errors
April 4, 2019, 11:14 (GMT)
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
March 8, 2019, 11:58 (GMT)
Type error
March 8, 2019, 11:39 (GMT)
Merge changes
March 8, 2019, 11:12 (GMT)
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
January 5, 2019, 09:29 (GMT)
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
January 2, 2019, 08:09 (GMT)
Fixed clipping distance calculation, but clip plane triangle cutting still have problems.
December 30, 2018, 03:28 (GMT)
Fixed intersection missings when bounding area separation occurs.
December 29, 2018, 13:31 (GMT)
Fixed hidden multi-thread error.
December 29, 2018, 07:05 (GMT)
Fix triangle-point test function for a stupid condition. See comment.
December 29, 2018, 05:04 (GMT)
make rendering into a loop to avoid callback stack overflow.
By: Miika HämäläinenLast update: Nov-07-2014 14:18 MiikaHweb | 2003-2019