Revision 46866fb by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) May 16, 2019, 02:03 (GMT) |
Solve merge errors in shader calls. |
Revision 5480411 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) May 16, 2019, 01:48 (GMT) |
Merge branch 'master' into soc-2018-npr |
Revision 2753611 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) May 6, 2019, 02:09 (GMT) |
Merge branch 'master' into soc-2018-npr |
Revision fbb5edf by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 24, 2019, 03:00 (GMT) |
Merge branch 'master' into soc-2018-npr # Conflicts: # source/blender/blenloader/intern/readfile.c |
Revision efcc83a by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 22, 2019, 01:46 (GMT) |
Merge branch 'master' into soc-2018-npr |
Revision 2c5bce2 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) 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 |
Revision 11229c4 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 12, 2019, 08:33 (GMT) |
Merge branch 'master' into soc-2018-npr |
Revision f1470a8 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 4, 2019, 13:57 (GMT) |
Fix modifier api |
Revision 92a33e4 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 4, 2019, 12:33 (GMT) |
Merge remote-tracking branch 'origin/master' into soc-2018-npr |
Revision 47495f6 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) April 4, 2019, 12:33 (GMT) |
Fix errors |
Revision 525c903 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) 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 |
Revision a08bf33 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) March 8, 2019, 11:58 (GMT) |
Type error |
Revision c46ce1b by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) March 8, 2019, 11:39 (GMT) |
Merge changes |
Revision 26fc7ef by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) 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 |
Revision 0ed5552 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) 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 |
Revision 8d78a25 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) January 2, 2019, 08:09 (GMT) |
Fixed clipping distance calculation, but clip plane triangle cutting still have problems. |
Revision 907ea48 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) December 30, 2018, 03:28 (GMT) |
Fixed intersection missings when bounding area separation occurs. |
Revision fd49ce1 by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) December 29, 2018, 13:31 (GMT) |
Fixed hidden multi-thread error. |
Revision 5ded8bc by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) December 29, 2018, 07:05 (GMT) |
Fix triangle-point test function for a stupid condition. See comment. |
Revision 628ff9b by YimingWu (greasepencil-object, greasepencil-refactor, soc-2018-npr, soc-2019-npr, temp-gpencil-eval) December 29, 2018, 05:04 (GMT) |
make rendering into a loop to avoid callback stack overflow. |
|