Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 24 Sep 2018 15:41:46 +0000 (17:41 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 24 Sep 2018 15:42:52 +0000 (17:42 +0200)
88 files changed:
1  2 
source/blender/blenkernel/BKE_action.h
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_bvhutils.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_dynamicpaint.h
source/blender/blenkernel/BKE_editmesh.h
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/BKE_library_query.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/intern/CCGSubSurf_intern.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/data_transfer.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/mesh_convert.c
source/blender/blenkernel/intern/mesh_evaluate.c
source/blender/blenkernel/intern/mesh_remap.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/nla.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/tracking.c
source/blender/collada/AnimationExporter.cpp
source/blender/collada/ControllerExporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/collada/SceneExporter.cpp
source/blender/collada/collada_utils.cpp
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.h
source/blender/depsgraph/intern/depsgraph.cc
source/blender/depsgraph/intern/depsgraph_types.h
source/blender/gpu/intern/gpu_shader.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_armature_types.h
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_gpencil_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_rigidbody_types.h
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_gpencil.c
source/blender/makesrna/intern/rna_lattice.c
source/blender/makesrna/intern/rna_linestyle.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/nodes/composite/nodes/node_composite_image.c
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit_blender.c
source/blender/windowmanager/intern/wm_cursors.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_files_link.c
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c

index 4cea52ea79218651994c8c03b7820524b5b99b43,661c802d64eaa768d12b8cc28360d2386ca0a8bc..9f2ebab6bd93eb17f91558828c043658a61c267a
@@@ -1961,13 -1985,12 +1961,13 @@@ static Mesh *dynamicPaint_Modifier_appl
                                                        /* Save preview results to weight layer to be
                                                         * able to share same drawing methods.
                                                         * Note this func also sets DM_DIRTY_TESS_CDLAYERS flag! */
 -                                                      DM_update_weight_mcol(ob, result, 0, weight, 0, NULL);
 +                                                      //TODO port this function
 +                                                      //DM_update_weight_mcol(ob, result, 0, weight, 0, NULL);
                                                }
  
-                                               /* apply weights into a vertex group, if doesnt exists add a new layer */
+                                               /* apply weights into a vertex group, if doesn't exists add a new layer */
                                                if (defgrp_index != -1 && !dvert && (surface->output_name[0] != '\0')) {
 -                                                      dvert = CustomData_add_layer(&result->vertData, CD_MDEFORMVERT, CD_CALLOC,
 +                                                      dvert = CustomData_add_layer(&result->vdata, CD_MDEFORMVERT, CD_CALLOC,
                                                                                     NULL, sData->total_points);
                                                }
                                                if (defgrp_index != -1 && dvert) {
index 73cb31146b8de24e0f95db2519aa9bc09703b288,a3fb99818804e599164d2919883cb07829a86d1a..6d9520dad1e4f1aae3f4fdbbf1b6a3da085337c8
@@@ -232,19 -239,23 +232,19 @@@ static bool is_child(const Object *ob, 
  static void make_child_duplis(const DupliContext *ctx, void *userdata, MakeChildDuplisFunc make_child_duplis_cb)
  {
        Object *parent = ctx->object;
 -      Object *obedit = ctx->scene->obedit;
 -
 -      if (ctx->group) {
 -              unsigned int lay = ctx->group->layer;
 -              int groupid = 0;
 -              GroupObject *go;
 -              for (go = ctx->group->gobject.first; go; go = go->next, groupid++) {
 -                      Object *ob = go->ob;
  
 -                      if ((ob->lay & lay) && ob != obedit && is_child(ob, parent)) {
 +      if (ctx->collection) {
 +              eEvaluationMode mode = DEG_get_mode(ctx->depsgraph);
 +              FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN(ctx->collection, ob, mode)
 +              {
 +                      if ((ob != ctx->obedit) && is_child(ob, parent)) {
                                DupliContext pctx;
 -                              copy_dupli_context(&pctx, ctx, ctx->object, NULL, groupid, false);
 +                              copy_dupli_context(&pctx, ctx, ctx->object, NULL, _base_id);
  
                                /* mballs have a different dupli handling */
 -                              if (ob->type != OB_MBALL)
 +                              if (ob->type != OB_MBALL) {
-                                       ob->flag |= OB_DONE;  /* doesnt render */
+                                       ob->flag |= OB_DONE;  /* doesn't render */
 -
 +                              }
                                make_child_duplis_cb(&pctx, userdata, ob);
                        }
                }
  
                                /* mballs have a different dupli handling */
                                if (ob->type != OB_MBALL)
--                                      ob->flag |= OB_DONE;  /* doesnt render */
++                                      ob->flag |= OB_DONE;  /* doesn't render */
  
                                make_child_duplis_cb(&pctx, userdata, ob);
                        }
Simple merge
Simple merge