[Bf-blender-cvs] [49490e5cfbe] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Wed Dec 12 03:03:06 CET 2018
Commit: 49490e5cfbeb2b0b823aa2042401891001870a6e
Author: Campbell Barton
Date: Wed Dec 12 12:55:20 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB49490e5cfbeb2b0b823aa2042401891001870a6e
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/alembic/intern/abc_exporter.cc
index d470488937a,9ffed421302..ff1465103eb
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -140,8 -136,8 +140,8 @@@ static bool object_type_is_exportable(S
/**
* Returns whether this object should be exported into the Alembic file.
*
- * \param settings export settings, used for options like 'selected only'.
- * \param ob the object's base in question.
+ * \param settings: export settings, used for options like 'selected only'.
- * \param ob: the object in question.
++ * \param ob: the object's base in question.
* \param is_duplicated: Normally false; true when the object is instanced
* into the scene by a dupli-object (e.g. part of a dupligroup).
* This ignores selection and layer visibility,
diff --cc source/blender/alembic/intern/abc_util.cc
index 53860ab149d,24a508e8292..90dfbd869f7
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@@ -61,15 -60,6 +61,15 @@@ std::string get_id_name(const ID * cons
return name;
}
+/**
- * @brief get_object_dag_path_name returns the name under which the object
++ * \brief get_object_dag_path_name returns the name under which the object
+ * will be exported in the Alembic file. It is of the form
+ * "[../grandparent/]parent/object" if dupli_parent is NULL, or
+ * "dupli_parent/[../grandparent/]parent/object" otherwise.
- * @param ob
- * @param dupli_parent
- * @return
++ * \param ob:
++ * \param dupli_parent:
++ * \return
+ */
std::string get_object_dag_path_name(const Object * const ob, Object *dupli_parent)
{
std::string name = get_id_name(ob);
diff --cc source/blender/blenkernel/BKE_modifier.h
index 6f3150880fa,2d39ac4d102..9504eff7dec
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@@ -156,22 -159,8 +156,22 @@@ typedef struct ModifierTypeInfo
/* Copy instance data for this modifier type. Should copy all user
* level settings to the target modifier.
+ *
- * \param flag Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
++ * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
*/
- void (*copyData)(const struct ModifierData *md, struct ModifierData *target);
+ void (*copyData)(const struct ModifierData *md, struct ModifierData *target, const int flag);
+
+
+ /********************* Deform modifier functions *********************/ /* DEPRECATED */
+
+ void (*deformVerts_DM_removed)(void);
+ void (*deformMatrices_DM_removed)(void);
+ void (*deformVertsEM_DM_removed)(void);
+ void (*deformMatricesEM_DM_removed)(void);
+
+ /********************* Non-deform modifier functions *********************/ /* DEPRECATED */
+
+ void (*applyModifier_DM_removed)(void);
/********************* Deform modifier functions *********************/
diff --cc source/blender/blenkernel/intern/anim_sys.c
index 8e8000f3ea0,d0262579663..9cdf94b3253
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@@ -266,12 -262,8 +266,12 @@@ void BKE_animdata_free(ID *id, const bo
/* Copying -------------------------------------------- */
-/* Make a copy of the given AnimData - to be used when copying datablocks */
-AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const bool do_action)
+/**
+ * Make a copy of the given AnimData - to be used when copying datablocks.
- * \param flag Control ID pointers management, see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
++ * \param flag: Control ID pointers management, see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
+ * \return The copied animdata.
+ */
+AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag)
{
AnimData *dadt;
@@@ -308,11 -296,7 +308,11 @@@
return dadt;
}
-bool BKE_animdata_copy_id(Main *bmain, ID *id_to, ID *id_from, const bool do_action)
+/**
- * \param flag Control ID pointers management, see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
++ * \param flag: Control ID pointers management, see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
+ * \return true is succesfully copied.
+ */
+bool BKE_animdata_copy_id(Main *bmain, ID *id_to, ID *id_from, const int flag)
{
AnimData *adt;
diff --cc source/blender/blenkernel/intern/armature.c
index 0c63d66bb29,65b6b2fe3b2..d1c1a47d137
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@@ -2155,36 -1950,9 +2155,36 @@@ void BKE_pose_clear_pointers(bPose *pos
}
}
-/* only after leave editmode, duplicating, validating older files, library syncing */
-/* NOTE: pose->flag is set for it */
-void BKE_pose_rebuild_ex(Object *ob, bArmature *arm, const bool sort_bones)
+void BKE_pose_remap_bone_pointers(bArmature *armature, bPose *pose)
+{
+ GHash *bone_hash = BKE_armature_bone_from_name_map(armature);
+ for (bPoseChannel *pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
+ pchan->bone = BLI_ghash_lookup(bone_hash, pchan->name);
+ }
+ BLI_ghash_free(bone_hash, NULL, NULL);
+}
+
+/** Find the matching pose channel using the bone name, if not NULL. */
+static bPoseChannel *pose_channel_find_bone(bPose *pose, Bone *bone)
+{
+ return (bone != NULL) ? BKE_pose_channel_find_name(pose, bone->name) : NULL;
+}
+
+/** Update the links for the B-Bone handles from Bone data. */
+void BKE_pchan_rebuild_bbone_handles(bPose *pose, bPoseChannel *pchan)
+{
+ pchan->bbone_prev = pose_channel_find_bone(pose, pchan->bone->bbone_prev);
+ pchan->bbone_next = pose_channel_find_bone(pose, pchan->bone->bbone_next);
+}
+
+/**
+ * Only after leave editmode, duplicating, validating older files, library syncing.
+ *
+ * \note pose->flag is set for it.
+ *
- * \param bmain May be NULL, only used to tag depsgraph as being dirty...
++ * \param bmain: May be NULL, only used to tag depsgraph as being dirty...
+ */
+void BKE_pose_rebuild(Main *bmain, Object *ob, bArmature *arm, const bool do_id_user)
{
Bone *bone;
bPose *pose;
diff --cc source/blender/blenkernel/intern/bvhutils.c
index 5c27b1b6207,e615fdfccbc..83b18a57ba4
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@@ -712,9 -651,10 +712,10 @@@ BVHTree *bvhtree_from_editmesh_edges
/**
* Builds a bvh tree where nodes are the given edges .
- * \param vert/edge_allocated if true, elem freeing will be done when freeing data.
- * \param edges_mask if not null, true elements give which vert to add to BVH tree.
- * \param edges_num_active if >= 0, number of active edges to add to BVH tree (else will be computed from mask).
- * \param vert, vert_allocated: If true, elem freeing will be done when freeing data.
- * \param edge, edge_allocated: If true, elem freeing will be done when freeing data.
++ * \param vert, vert_allocated: if true, elem freeing will be done when freeing data.
++ * \param edge, edge_allocated: if true, elem freeing will be done when freeing data.
+ * \param edges_mask: if not null, true elements give which vert to add to BVH tree.
+ * \param edges_num_active: if >= 0, number of active edges to add to BVH tree (else will be computed from mask).
*/
BVHTree *bvhtree_from_mesh_edges_ex(
BVHTreeFromMesh *data,
diff --cc source/blender/blenkernel/intern/camera.c
index ab9129e107a,5dd60e8dd73..f701538e0f9
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@@ -103,11 -98,11 +103,11 @@@ void *BKE_camera_add(Main *bmain, cons
*
* WARNING! This function will not handle ID user count!
*
- * \param flag Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
+ * \param flag: Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more).
*/
-void BKE_camera_copy_data(Main *UNUSED(bmain), Camera *UNUSED(cam_dst), const Camera *UNUSED(cam_src), const int UNUSED(flag))
+void BKE_camera_copy_data(Main *UNUSED(bmain), Camera *cam_dst, const Camera *cam_src, const int UNUSED(flag))
{
- /* Nothing to do! */
+ BLI_duplicatelist(&cam_dst->bg_images, &cam_src->bg_images);
}
Camera *BKE_camera_copy(Main *bmain, const Camera *cam)
diff --cc source/blender/blenkernel/intern/collection.c
index 763c0d51cb5,00000000000..9b68c61e016
mode 100644,000000..100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@@ -1,1200 -1,0 +1,1200 @@@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Dalai Felinto
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/blenkernel/intern/collection.c
+ * \ingroup bke
+ */
+
+#include <string.h>
+
+#include "BLI_blenlib.h"
+#include "BLI_ghash.h"
+#include "BLI_iterator.h"
+#include "BLI_listbase.h"
+#include "BLI_math_base.h"
+#include "BLI_threads.h"
+#include "BLT_translation.h"
+#include "BLI_string_utils.h"
+
+#include "BKE_collection.h"
+#include "BKE_icons.h"
+#include "BKE_idprop.h"
+#include "BKE_layer.h"
+#include "BKE_library.h"
+#include "BKE_main.h"
+#include "BKE_object.h"
+#include "BKE_scene.h"
+
+#include "DNA_ID.h"
+#include "DNA_collection_types.h"
+#include "DNA_layer_types.h"
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+
+#include "DEG_depsgraph.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list