Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:56:49 +0000 (13:56 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Feb 2018 02:56:49 +0000 (13:56 +1100)
build_files/cmake/cmake_consistency_check_config.py
extern/glog/CMakeLists.txt
intern/cycles/CMakeLists.txt
intern/cycles/app/CMakeLists.txt
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_sequencer/sequencer_edit.c

index 9ec1c095a9c72800b79e818d53fbdc99a4ae9b64..2fbf855c38638204ec33ccaaf0b8a356b1438247 100644 (file)
@@ -25,10 +25,6 @@ IGNORE = (
     "extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btHinge2Constraint.h",
     "extern/bullet2/src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h",
-    "extern/carve/include/carve/config.h",
-    "extern/carve/include/carve/random/random.h",
-    "extern/carve/patches/files/config.h",
-    "extern/carve/patches/files/random.h",
     "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
     "intern/audaspace/SRC/AUD_SRCResampleReader.h",
 )
index 15e6aff9714e0ce8c55d71fb1a53777f5b968d3d..32f4dca77e8569d12e02d904f198d339557ef385 100644 (file)
@@ -40,6 +40,7 @@ set(SRC
 
        src/config.h
        src/config_freebsd.h
+       src/config_haiku.h
        src/config_hurd.h
        src/config_linux.h
        src/config_mac.h
index f720d389cbf19d3a1fb02cc58c2ff78707f4bdb1..e7b934ec74f357ebafaf4adbdcb13b87a1dd61cc 100644 (file)
@@ -253,7 +253,7 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
                elseif(${CUDA_VERSION} EQUAL "9.1")
                        set(MAX_MSVC 1911)
                endif()
-               if (NOT MSVC_VERSION LESS ${MAX_MSVC})
+               if(NOT MSVC_VERSION LESS ${MAX_MSVC})
                        message(STATUS "nvcc not supported for this compiler version, using cycles_cubin_cc instead.")
                        set(WITH_CYCLES_CUBIN_COMPILER ON)
                endif()
index 9ebeceb1659eb11598252bbda0f7e0db03bc8506..a8e0297aeaa22a9c012ee6be307d00dbb876f4e0 100644 (file)
@@ -128,8 +128,12 @@ if(WITH_CYCLES_CUBIN_COMPILER)
        if(MSVC AND NOT CMAKE_CL_64)
                Message("cycles_cubin_cc not supported on x86")
        else()
-               set(SRC cycles_cubin_cc.cpp)
-               set(INC ../../../extern/cuew/include)
+               set(SRC
+                       cycles_cubin_cc.cpp
+               )
+               set(INC
+                       ../../../extern/cuew/include
+               )
                add_executable(cycles_cubin_cc ${SRC})
                include_directories(${INC})
                target_link_libraries(cycles_cubin_cc
index 94f377fb35ec2767fe652243837187e8564287cb..523215da29e070322fa8aa77200ed0ad0a4546c6 100644 (file)
@@ -70,7 +70,9 @@ set(SRC
        view2d.c
        view2d_ops.c
 
+       interface_eyedropper_intern.h
        interface_intern.h
+       interface_regions_intern.h
 )
 
 if(WITH_INTERNATIONAL)
index d6b279008f0ed2631105fcd2c28fbbfa0720919f..5b59de06d0aecd26ff90e6fbf5c6e2860b3cee35 100644 (file)
@@ -4597,19 +4597,17 @@ static bool sculpt_any_smooth_mode(const Brush *brush,
                 (brush->mask_tool == BRUSH_MASK_SMOOTH)));
 }
 
-static void sculpt_stroke_modifiers_check(const bContext *C, Object *ob)
+static void sculpt_stroke_modifiers_check(const bContext *C, Object *ob, const Brush *brush)
 {
        SculptSession *ss = ob->sculpt;
 
        if (ss->kb || ss->modifiers_active) {
                EvaluationContext eval_ctx;
-               Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
-               Brush *brush = BKE_paint_brush(&sd->paint);
-
                CTX_data_eval_ctx(C, &eval_ctx);
-
-               BKE_sculpt_update_mesh_elements(&eval_ctx, CTX_data_scene(C), sd, ob,
-                                           sculpt_any_smooth_mode(brush, ss->cache, 0), false);
+               Scene *scene = CTX_data_scene(C);
+               Sculpt *sd = scene->toolsettings->sculpt;
+               bool need_pmap = sculpt_any_smooth_mode(brush, ss->cache, 0);
+               BKE_sculpt_update_mesh_elements(&eval_ctx, scene, sd, ob, need_pmap, false);
        }
 }
 
@@ -4738,7 +4736,9 @@ bool sculpt_stroke_get_location(bContext *C, float out[3], const float mouse[2])
        cache = ss->cache;
        original = (cache) ? cache->original : 0;
 
-       sculpt_stroke_modifiers_check(C, ob);
+       const Brush *brush = BKE_paint_brush(BKE_paint_get_active_from_context(C));
+
+       sculpt_stroke_modifiers_check(C, ob, brush);
 
        depth = sculpt_raycast_init(&vc, mouse, ray_start, ray_end, ray_normal, original);
 
@@ -4764,7 +4764,6 @@ bool sculpt_stroke_get_location(bContext *C, float out[3], const float mouse[2])
        }
 
        if (hit == false) {
-               const Brush *brush = BKE_paint_brush(BKE_paint_get_active_from_context(C));
                if (ELEM(brush->falloff_shape, PAINT_FALLOFF_SHAPE_TUBE)) {
                        SculptFindNearestToRayData srd = {
                                .original = original,
@@ -4955,7 +4954,7 @@ static void sculpt_stroke_update_step(bContext *C, struct PaintStroke *UNUSED(st
        SculptSession *ss = ob->sculpt;
        const Brush *brush = BKE_paint_brush(&sd->paint);
        
-       sculpt_stroke_modifiers_check(C, ob);
+       sculpt_stroke_modifiers_check(C, ob, brush);
        sculpt_update_cache_variants(C, sd, ob, itemptr);
        sculpt_restore_mesh(sd, ob);
 
@@ -5030,7 +5029,7 @@ static void sculpt_stroke_done(const bContext *C, struct PaintStroke *UNUSED(str
                BLI_assert(brush == ss->cache->brush);  /* const, so we shouldn't change. */
                ups->draw_inverted = false;
 
-               sculpt_stroke_modifiers_check(C, ob);
+               sculpt_stroke_modifiers_check(C, ob, brush);
 
                /* Alt-Smooth */
                if (ss->cache->alt_smooth) {
@@ -5855,7 +5854,9 @@ static void sample_detail(bContext *C, int ss_co[2])
        sd = CTX_data_tool_settings(C)->sculpt;
        ob = vc.obact;
 
-       sculpt_stroke_modifiers_check(C, ob);
+       Brush *brush = BKE_paint_brush(&sd->paint);
+
+       sculpt_stroke_modifiers_check(C, ob, brush);
 
        depth = sculpt_raycast_init(&vc, mouse, ray_start, ray_end, ray_normal, false);
 
index cb0c5bd37170c87a1cc670574f41345cd56d282f..e1163fd32077d91ad31c4147f9cadd43e6b8ce19 100644 (file)
@@ -2785,7 +2785,7 @@ static int sequencer_view_zoom_ratio_exec(bContext *C, wmOperator *op)
        float facx = BLI_rcti_size_x(&v2d->mask) / winx;
        float facy = BLI_rcti_size_y(&v2d->mask) / winy;
 
-       BLI_rctf_resize(&v2d->cur, floorf(winx * facx / ratio + 0.5f), floorf(winy * facy / ratio + 0.5f));
+       BLI_rctf_resize(&v2d->cur, ceilf(winx * facx / ratio + 0.5f), ceilf(winy * facy / ratio + 0.5f));
 
        ED_region_tag_redraw(CTX_wm_region(C));