Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Sat, 17 Dec 2016 12:07:00 +0000 (13:07 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Sat, 17 Dec 2016 12:07:00 +0000 (13:07 +0100)
Conflicts:
intern/cycles/blender/CMakeLists.txt
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/physics/physics_ops.c

1  2 
intern/cycles/blender/CMakeLists.txt
intern/cycles/blender/blender_object.cpp
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/rigidbody.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform_manipulator.c
source/blenderplayer/bad_level_call_stubs/stubs.c

index 5cf482cfad3e948a909449b76dfaec798007ad4d,b57502b3b141a8bcd5d8951c2031641124a63ae9..f964f2d1f9e2dd80f81f74b87734f6da9d27660a
@@@ -25,6 -25,8 +25,7 @@@ set(SR
        blender_camera.cpp
        blender_mesh.cpp
        blender_object.cpp
 -      blender_particles.cpp
+       blender_object_cull.cpp
        blender_curves.cpp
        blender_logging.cpp
        blender_python.cpp
index 181f85e09094ce1487dc518ccf4729a4abce5c19,9da3c3ee0880bfd99375dbf9a879348551380a63..d09d441d71b7cbd0340a6f1efae9bf2838a834b7
@@@ -1632,10 -1573,8 +1642,8 @@@ static void gp_draw_data_all(Scene *sce
                        /* currently drawing only gpencil data from either clip or track, but not both - XXX fix logic behind */
                        gpd_source = (scene->clip->gpd ? scene->clip->gpd : NULL);
                }
 -              
 +
                if (gpd_source) {
-                       ToolSettings *ts = scene->toolsettings;
-                       bGPDbrush *brush = BKE_gpencil_brush_getactive(ts);
                        if (brush != NULL) {
                                gp_draw_data(brush, ts->gp_sculpt.alpha, gpd_source,
                                             offsx, offsy, winx, winy, cfra, dflag);