diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 15:26:26 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-13 15:28:05 +0300 |
| commit | 5ff1d845ead05ac6ef952782ebd3ed98277ef6c5 (patch) | |
| tree | 9be449d931fff0a332a7e4ec8e0cc27874eca496 /source/blender/editors/transform/transform_generics.c | |
| parent | 2002fe27d97223f241580777b1a9073755181e45 (diff) | |
Cleanup: moar ugly G.main removal...
Note that due to RNA get/setters issue, that one may actually add some
G.main usages to the total... But at least it's not hidden anymore in a
very low-level, dark corner of BKE pointcache code!
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index fec98c77c19..477e1abf80f 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -75,6 +75,7 @@ #include "BKE_fcurve.h" #include "BKE_lattice.h" #include "BKE_library.h" +#include "BKE_main.h" #include "BKE_nla.h" #include "BKE_context.h" #include "BKE_paint.h" @@ -734,6 +735,7 @@ static void recalcData_spaceclip(TransInfo *t) /* helper for recalcData() - for object transforms, typically in the 3D view */ static void recalcData_objects(TransInfo *t) { + Main *bmain = CTX_data_main(t->context); Base *base = t->scene->basact; if (t->obedit) { @@ -921,7 +923,7 @@ static void recalcData_objects(TransInfo *t) else BKE_pose_where_is(t->scene, ob); } - else if (base && (base->object->mode & OB_MODE_PARTICLE_EDIT) && PE_get_current(t->scene, base->object)) { + else if (base && (base->object->mode & OB_MODE_PARTICLE_EDIT) && PE_get_current(bmain, t->scene, base->object)) { if (t->state != TRANS_CANCEL) { applyProject(t); } |