[Bf-blender-cvs] [7f81bb4931a] temp-lanpr-review: Merge remote-tracking branch 'origin/master' into temp-lanpr-review
YimingWu
noreply at git.blender.org
Tue Dec 3 06:31:21 CET 2019
Commit: 7f81bb4931acaab2749def9f4fcf5c08509eb92b
Author: YimingWu
Date: Tue Dec 3 13:30:50 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rB7f81bb4931acaab2749def9f4fcf5c08509eb92b
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
===================================================================
===================================================================
diff --cc build_files/cmake/config/blender_full.cmake
index 128bb80b1e9,fae15ea979b..ba0977351fa
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@@ -18,8 -18,6 +18,7 @@@ set(WITH_LIBMV ON CACHE
set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE)
set(WITH_FREESTYLE ON CACHE BOOL "" FORCE)
+set(WITH_LANPR ON CACHE BOOL "" FORCE)
- set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE)
set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE)
set(WITH_IK_ITASC ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_lite.cmake
index a08bf75fc4a,3a67836d253..984d93effcd
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@@ -24,8 -24,6 +24,7 @@@ set(WITH_LIBMV OFF CACHE
set(WITH_LLVM OFF CACHE BOOL "" FORCE)
set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE)
set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE)
+set(WITH_LANPR OFF CACHE BOOL "" FORCE)
- set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE)
set(WITH_IK_SOLVER OFF CACHE BOOL "" FORCE)
set(WITH_IK_ITASC OFF CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON OFF CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_release.cmake
index 2be274705e5,07d95a84112..63c6e7a50b6
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -19,8 -19,6 +19,7 @@@ set(WITH_LIBMV ON CACHE
set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE)
set(WITH_FREESTYLE ON CACHE BOOL "" FORCE)
+set(WITH_LANPR ON CACHE BOOL "" FORCE)
- set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE)
set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE)
set(WITH_IK_ITASC ON CACHE BOOL "" FORCE)
set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE)
diff --cc source/blender/blenloader/intern/versioning_280.c
index 23be0f1ce53,6c8b14ad5c7..fc203f2a1c7
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -4230,19 -4215,58 +4215,71 @@@ void blo_do_versions_280(FileData *fd,
ToolSettings *ts = scene->toolsettings;
UnifiedPaintSettings *ups = &ts->unified_paint_settings;
ups->flag &= ~(UNIFIED_PAINT_FLAG_UNUSED_0 | UNIFIED_PAINT_FLAG_UNUSED_1);
+
+ if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
+ for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+
+ scene->lanpr.crease_threshold = 0.7;
+
+ scene->lanpr.flags |= (LANPR_USE_CHAINING | LANPR_USE_INTERSECTIONS);
+
+ zero_v4(scene->lanpr.line_color);
+
+ scene->lanpr.line_color[3] = 1;
+ }
+ }
}
+
+ /* Set the default render pass in the viewport to Combined. */
+ if (!DNA_struct_elem_find(fd->filesdna, "View3DShading", "int", "render_pass")) {
+ for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
+ scene->display.shading.render_pass = SCE_PASS_COMBINED;
+ }
+
+ for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+ for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
+ if (sl->spacetype == SPACE_VIEW3D) {
+ View3D *v3d = (View3D *)sl;
+ v3d->shading.render_pass = SCE_PASS_COMBINED;
+ }
+ }
+ }
+ }
+ }
+
+ /* Make markers region visible by default. */
+ for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+ for (ScrArea *area = screen->areabase.first; area; area = area->next) {
+ for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
+ switch (sl->spacetype) {
+ case SPACE_SEQ: {
+ SpaceSeq *sseq = (SpaceSeq *)sl;
+ sseq->flag |= SEQ_SHOW_MARKERS;
+ break;
+ }
+ case SPACE_ACTION: {
+ SpaceAction *saction = (SpaceAction *)sl;
+ saction->flag |= SACTION_SHOW_MARKERS;
+ break;
+ }
+ case SPACE_GRAPH: {
+ SpaceGraph *sipo = (SpaceGraph *)sl;
+ sipo->flag |= SIPO_SHOW_MARKERS;
+ break;
+ }
+ case SPACE_NLA: {
+ SpaceNla *snla = (SpaceNla *)sl;
+ snla->flag |= SNLA_SHOW_MARKERS;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ {
+ /* Versioning code until next subversion bump goes here. */
}
-}
+}
diff --cc source/blender/draw/CMakeLists.txt
index 8e1fb7dfd70,ea52d8e8f1f..61e468bf7d9
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -394,16 -307,80 +321,90 @@@ data_to_c_simple(engines/gpencil/shader
data_to_c_simple(engines/select/shaders/selection_id_3D_vert.glsl SRC)
data_to_c_simple(engines/select/shaders/selection_id_frag.glsl SRC)
+if(WITH_LANPR)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_geom.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_preview_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_clip_frag.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_dpix_project_passthrough_vert.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_software_line_chain_geom.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_software_passthrough_vert.glsl SRC)
+ data_to_c_simple(engines/lanpr/shaders/lanpr_software_chain_geom.glsl SRC)
+endif()
+
+ data_to_c_simple(engines/overlay/shaders/antialiasing_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/antialiasing_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_dof_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_envelope_outline_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_envelope_solid_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_envelope_solid_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_shape_outline_geom.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_shape_outline_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_shape_solid_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_shape_solid_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_sphere_outline_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_sphere_solid_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_sphere_solid_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_stick_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_stick_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/armature_wire_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/depth_only_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_curve_handle_geom.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_curve_handle_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_curve_point_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_curve_wire_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_lattice_point_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_lattice_wire_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_common_lib.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_facefill_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_facefill_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_geom.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_normal_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_analysis_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_analysis_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_skin_root_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_mesh_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_particle_strand_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/edit_particle_point_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_groundline_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_loose_point_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_loose_point_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_point_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_wire_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/extra_wire_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/facing_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/facing_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/grid_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/grid_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/image_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/image_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/motion_path_line_geom.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/motion_path_line_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/motion_path_point_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/outline_detect_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/outline_expand_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/outline_prepass_frag.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/outline_prepass_geom.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/outline_prepass_vert.glsl SRC)
+ data_to_c_simple(engines/overlay/shaders/outli
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list