Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2016 09:25:44 +0000 (19:25 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jul 2016 09:25:44 +0000 (19:25 +1000)
40 files changed:
1  2 
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_sync.cpp
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_texture.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/object_update.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/texture.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/blenloader/intern/writefile.c
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/editors/transform/transform_snap_object.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c

Simple merge
@@@ -332,17 -332,20 +331,17 @@@ bool id_make_local(Main *bmain, ID *id
                case ID_GR:
                        return false; /* not implemented */
                case ID_AR:
-                       if (!test) BKE_armature_make_local(bmain, (bArmature *)id);
+                       if (!test) BKE_armature_make_local(bmain, (bArmature *)id, force_local);
                        return true;
                case ID_AC:
-                       if (!test) BKE_action_make_local(bmain, (bAction *)id);
+                       if (!test) BKE_action_make_local(bmain, (bAction *)id, force_local);
                        return true;
                case ID_NT:
-                       if (!test) ntreeMakeLocal(bmain, (bNodeTree *)id, true);
+                       if (!test) ntreeMakeLocal(bmain, (bNodeTree *)id, true, force_local);
                        return true;
                case ID_BR:
-                       if (!test) BKE_brush_make_local(bmain, (Brush *)id);
+                       if (!test) BKE_brush_make_local(bmain, (Brush *)id, force_local);
                        return true;
 -              case ID_PA:
 -                      if (!test) BKE_particlesettings_make_local(bmain, (ParticleSettings *)id, force_local);
 -                      return true;
                case ID_WM:
                        return false; /* can't be linked */
                case ID_GD:
@@@ -3075,7 -3076,12 +3075,9 @@@ static int viewselected_exec(bContext *
        else if (BKE_paint_select_face_test(ob)) {
                ok = paintface_minmax(ob, min, max);
        }
-       else if (ob && (ob->mode & (OB_MODE_SCULPT | OB_MODE_TEXTURE_PAINT))) {
 -      else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT)) {
 -              ok = PE_minmax(scene, min, max);
 -      }
+       else if (ob &&
+                (ob->mode & (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)))
+       {
                BKE_paint_stroke_get_average(scene, ob, min);
                copy_v3_v3(max, min);
                ok = true;
@@@ -1451,17 -1862,25 +1862,9 @@@ static bool snapObjectsRay
  {
        bool retval = false;
  
-       float dvec[3];
-       sub_v3_v3v3(dvec, ray_start, ray_origin);
-       const float ray_depth_range[2] = {
-               dot_v3v3(dvec, ray_normal),
-               *ray_depth,
-       };
        unsigned int ob_index = 0;
        Object *obedit = use_object_edit_cage ? sctx->scene->obedit : NULL;
 -
 -      /* Need an exception for particle edit because the base is flagged with BA_HAS_RECALC_DATA
 -       * which makes the loop skip it, even the derived mesh will never change
 -       *
 -       * To solve that problem, we do it first as an exception.
 -       * */
        Base *base_act = sctx->scene->basact;
 -      if (base_act && base_act->object && base_act->object->mode & OB_MODE_PARTICLE_EDIT) {
 -              Object *ob = base_act->object;
 -
 -              retval |= snapObject(
 -                      sctx, ob, ob->obmat, ob_index++,
 -                      false, snap_to, mval,
 -                      ray_origin, ray_start, ray_normal, depth_range,
 -                      ray_depth, dist_px,
 -                      r_loc, r_no, r_index, r_ob, r_obmat, r_hit_list);
 -      }
  
        bool ignore_object_selected = false, ignore_object_active = false;
        switch (snap_select) {
Simple merge
Simple merge