Commit: 3af98b4c04b33791254a4abe0a03ed65007d5e9a
Author: Bastien Montagne
Date: Sat Dec 17 13:07:00 2016 +0100
Branches: blender2.8
https://developer.blender.org/rB3af98b4c04b33791254a4abe0a03ed65007d5e9a
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/CMakeLists.txt
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/physics/physics_ops.c
===================================================================
===================================================================
diff --cc intern/cycles/blender/CMakeLists.txt
index 5cf482c,b57502b..f964f2d
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@@ -25,6 -25,8 +25,7 @@@ set(SR
blender_camera.cpp
blender_mesh.cpp
blender_object.cpp
+ blender_object_cull.cpp
- blender_particles.cpp
blender_curves.cpp
blender_logging.cpp
blender_python.cpp
diff --cc source/blender/editors/gpencil/drawgpencil.c
index 181f85e,9da3c3e..d09d441
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@@ -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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
