diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:36:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-29 18:38:16 +0300 |
commit | 0efecba957eea45621c004217a76448f11f0376d (patch) | |
tree | 26a11c55c969a8c4389f9797f5e46b3d7ed186fc /source/blender/editors | |
parent | 21105e1b1f1266a3846462588bdbe840d09758ea (diff) | |
parent | 39eb05161690510ecec4c30129a9f8d5532d39c9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/gpencil/gpencil_data.c | 6 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 8 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 6 |
3 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index 548294df388..3321bec3846 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -683,9 +683,9 @@ static int gp_frame_clean_fill_exec(bContext *C, wmOperator *op) void GPENCIL_OT_frame_clean_fill(wmOperatorType *ot) { static const EnumPropertyItem duplicate_mode[] = { - { GP_FRAME_CLEAN_FILL_ACTIVE, "ACTIVE", 0, "Active Frame Only", "Clean active frame only" }, - { GP_FRAME_CLEAN_FILL_ALL, "ALL", 0, "All Frames", "Clean all frames in all layers" }, - { 0, NULL, 0, NULL, NULL } + {GP_FRAME_CLEAN_FILL_ACTIVE, "ACTIVE", 0, "Active Frame Only", "Clean active frame only"}, + {GP_FRAME_CLEAN_FILL_ALL, "ALL", 0, "All Frames", "Clean all frames in all layers"}, + {0, NULL, 0, NULL, NULL} }; /* identifiers */ diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index df786b4e675..3b2404415a7 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -3330,10 +3330,10 @@ static int gp_stroke_separate_exec(bContext *C, wmOperator *op) void GPENCIL_OT_stroke_separate(wmOperatorType *ot) { static const EnumPropertyItem separate_type[] = { - {GP_SEPARATE_POINT, "POINT", 0, "Selected Points", "Separate the selected points" }, - {GP_SEPARATE_STROKE, "STROKE", 0, "Selected Strokes", "Separate the selected strokes"}, - {GP_SEPARATE_LAYER, "LAYER", 0, "Active Layer", "Separate the strokes of the current layer" }, - { 0, NULL, 0, NULL, NULL } + {GP_SEPARATE_POINT, "POINT", 0, "Selected Points", "Separate the selected points"}, + {GP_SEPARATE_STROKE, "STROKE", 0, "Selected Strokes", "Separate the selected strokes"}, + {GP_SEPARATE_LAYER, "LAYER", 0, "Active Layer", "Separate the strokes of the current layer"}, + {0, NULL, 0, NULL, NULL} }; /* identifiers */ diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index f73cdc30292..9c7c9fde066 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3764,7 +3764,8 @@ static void brush_add_count_iter( &min_d, &add_pars[iter].num_dmcache, add_pars[iter].fuv, - 0, 0, 0, 0)) { + 0, 0, 0, 0)) + { if (psys->part->use_modifier_stack && !psmd_eval->mesh_final->runtime.deformed_only) { add_pars[iter].num = add_pars[iter].num_dmcache; add_pars[iter].num_dmcache = DMCACHE_ISCHILD; @@ -4645,7 +4646,8 @@ int PE_minmax(Scene *scene, ViewLayer *view_layer, float min[3], float max[3]) static struct ParticleSystem *psys_eval_get( Depsgraph *depsgraph, Object *object, - ParticleSystem *psys){ + ParticleSystem *psys) +{ Object *object_eval = DEG_get_evaluated_object(depsgraph, object); if (object_eval == object) { return psys; |