diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-26 18:19:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-09-26 18:19:03 +0300 |
| commit | 8cff9c20fff954cb0aa725c15c064c3aecf322b5 (patch) | |
| tree | 99bd6e859bcfbe56f555bfe2d1e4eae374fdf1c3 /source/blender/editors/screen/screen_context.c | |
| parent | 628ef78e8a9db7ba37cfc1bbb6b2d4ac0dbecab3 (diff) | |
| parent | b23ffded0866b5b24cb50fca669efde4ec1e3ffd (diff) | |
Merge branch 'master' into blender2.8
WARNING! Full build is broken, alembic has not been merged in correctly and has some references to particle stuff.
Don't have time to tackle this now (and probably would be better if someone knowing what he's doing does it anyway).
Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/physics/particle_object.c
source/blender/editors/physics/physics_intern.h
source/blender/editors/physics/physics_ops.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_view3d/drawvolume.c
source/blender/makesrna/intern/rna_smoke.c
Diffstat (limited to 'source/blender/editors/screen/screen_context.c')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index b55330602e9..2cf0a16f236 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -503,7 +503,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult bGPDbrush *brush = BKE_gpencil_brush_getactive(scene->toolsettings); if (brush) { - CTX_data_pointer_set(result, NULL, &RNA_GPencilBrush, brush); + CTX_data_pointer_set(result, &scene->id, &RNA_GPencilBrush, brush); return 1; } } |