Merge branch 'master' into blender28
authorCampbell Barton <ideasman42@gmail.com>
Fri, 6 Oct 2017 10:25:33 +0000 (21:25 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 6 Oct 2017 10:25:33 +0000 (21:25 +1100)
33 files changed:
1  2 
CMakeLists.txt
build_files/build_environment/install_deps.sh
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/render/buffers.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_pbvh.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mball_tessellate.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/pbvh.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_internal.c
source/blender/editors/screen/screen_context.c
source/blender/editors/sculpt_paint/paint_cursor.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/python/generic/bgl.c
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_library_load.c
source/blender/python/intern/gpu.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_window.c

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 04c7e6e2a62d7d06c6ef100521a092e1e50fc4dd,5bc21457d54300dfb7c3260ef6292c6aa7478dd9..befb635cfc4ab9fef21f2d41a06027a4f8770ce6
@@@ -1021,12 -1001,11 +1022,12 @@@ static void paint_draw_cursor(bContext 
  
        /* can't use stroke vc here because this will be called during
         * mouse over too, not just during a stroke */
 +      ViewContext vc;
        view3d_set_viewcontext(C, &vc);
  
-       float zoomx, zoomy;
-       get_imapaint_zoom(C, &zoomx, &zoomy);
-       zoomx = max_ff(zoomx, zoomy);
+       if (vc.rv3d->rflag & RV3D_NAVIGATING) {
+               return;
+       }
  
        /* skip everything and draw brush here */
        if (brush->flag & BRUSH_CURVE) {
                return;
        }
  
++      float zoomx, zoomy;
+       get_imapaint_zoom(C, &zoomx, &zoomy);
+       zoomx = max_ff(zoomx, zoomy);
        /* set various defaults */
 -      translation[0] = x;
 -      translation[1] = y;
 -      outline_alpha = 0.5;
 -      outline_col = brush->add_col;
 -      final_radius = (BKE_brush_size_get(scene, brush) * zoomx);
 +      const float *outline_col = brush->add_col;
 +      const float outline_alpha = 0.5f;
 +      float translation[2] = { x, y };
 +      float final_radius = (BKE_brush_size_get(scene, brush) * zoomx);
  
        /* don't calculate rake angles while a stroke is active because the rake variables are global and
         * we may get interference with the stroke itself. For line strokes, such interference is visible */
Simple merge
Simple merge
Simple merge