Commit: 028580fd1ed38efb85bef35053685e3e8e69ad9b
Author: Campbell Barton
Date:   Tue Mar 13 18:39:51 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB028580fd1ed38efb85bef35053685e3e8e69ad9b

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/blenkernel/BKE_object.h
index 536b21e83ce,5578290c41a..11e259e0318
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@@ -141,18 -122,17 +141,24 @@@ void BKE_object_to_mat4(struct Object *
  void BKE_object_apply_mat4(struct Object *ob, float mat[4][4], const bool 
use_compat, const bool use_parent);
  void BKE_object_matrix_local_get(struct Object *ob, float mat[4][4]);
  
 +bool BKE_object_pose_context_check_ex(struct Object *ob, bool selected);
  bool BKE_object_pose_context_check(struct Object *ob);
  struct Object *BKE_object_pose_armature_get(struct Object *ob);
 +struct Object *BKE_object_pose_armature_get_visible(struct Object *ob, struct 
ViewLayer *view_layer);
  
- void BKE_object_get_parent_matrix(struct Scene *scene, struct Object *ob,
-                                   struct Object *par, float parentmat[4][4]);
- void BKE_object_where_is_calc(const struct EvaluationContext *eval_ctx, 
struct Scene *scene, struct Object *ob);
- void BKE_object_where_is_calc_ex(const struct EvaluationContext *eval_ctx, 
struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob, float 
r_originmat[3][3]);
- void BKE_object_where_is_calc_time(const struct EvaluationContext *eval_ctx, 
struct Scene *scene, struct Object *ob, float ctime);
- void BKE_object_where_is_calc_time_ex(const struct EvaluationContext 
*eval_ctx, struct Scene *scene, struct Object *ob, float ctime,
-                                       struct RigidBodyWorld *rbw, float 
r_originmat[3][3]);
 -void BKE_object_get_parent_matrix(struct Scene *scene, struct Object *ob, 
struct Object *par, float parentmat[4][4]);
 -void BKE_object_where_is_calc(struct Scene *scene, struct Object *ob);
++void BKE_object_get_parent_matrix(
++        struct Scene *scene, struct Object *ob,
++        struct Object *par, float parentmat[4][4]);
++void BKE_object_where_is_calc(
++        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct 
Object *ob);
+ void BKE_object_where_is_calc_ex(
 -        struct Scene *scene, struct RigidBodyWorld *rbw, struct Object *ob, 
float r_originmat[3][3]);
 -void BKE_object_where_is_calc_time(struct Scene *scene, struct Object *ob, 
float ctime);
++        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct 
RigidBodyWorld *rbw,
++        struct Object *ob, float r_originmat[3][3]);
++void BKE_object_where_is_calc_time(
++        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct 
Object *ob, float ctime);
+ void BKE_object_where_is_calc_time_ex(
 -        struct Scene *scene, struct Object *ob, float ctime,
++        const struct EvaluationContext *eval_ctx, struct Scene *scene, struct 
Object *ob, float ctime,
+         struct RigidBodyWorld *rbw, float r_originmat[3][3]);
  void BKE_object_where_is_calc_mat4(struct Scene *scene, struct Object *ob, 
float obmat[4][4]);
  
  /* possibly belong in own moduke? */
@@@ -168,14 -148,18 +174,17 @@@ void BKE_object_dimensions_set(struct O
  void BKE_object_empty_draw_type_set(struct Object *ob, const int value);
  void BKE_object_boundbox_flag(struct Object *ob, int flag, const bool set);
  void BKE_object_minmax(struct Object *ob, float r_min[3], float r_max[3], 
const bool use_hidden);
- bool BKE_object_minmax_dupli(struct Scene *scene, struct Object *ob, float 
r_min[3], float r_max[3], const bool use_hidden);
+ bool BKE_object_minmax_dupli(
+         struct Scene *scene, struct Object *ob, float r_min[3], float 
r_max[3], const bool use_hidden);
  
  /* sometimes min-max isn't enough, we need to loop over each point */
- void BKE_object_foreach_display_point(struct Object *ob, float obmat[4][4],
-                                       void (*func_cb)(const float[3], void 
*), void *user_data);
- void BKE_scene_foreach_display_point(struct Scene *scene,
-                                      struct ViewLayer *view_layer,
-                                      void (*func_cb)(const float[3], void *), 
void *user_data);
+ void BKE_object_foreach_display_point(
+         struct Object *ob, float obmat[4][4],
+         void (*func_cb)(const float[3], void *), void *user_data);
+ void BKE_scene_foreach_display_point(
+         struct Scene *scene,
 -        struct View3D *v3d,
 -        const short flag,
++        struct ViewLayer *view_layer,
+         void (*func_cb)(const float[3], void *), void *user_data);
  
  bool BKE_object_parent_loop_check(const struct Object *parent, const struct 
Object *ob);
  
@@@ -191,58 -175,58 +200,71 @@@ typedef struct ObjectTfmProtectedChanne
        float rotAngle,   drotAngle;
  } ObjectTfmProtectedChannels;
  
- void BKE_object_tfm_protected_backup(const struct Object *ob,
-                                      ObjectTfmProtectedChannels *obtfm);
+ void BKE_object_tfm_protected_backup(
+         const struct Object *ob,
+         ObjectTfmProtectedChannels *obtfm);
  
- void BKE_object_tfm_protected_restore(struct Object *ob,
-                                       const ObjectTfmProtectedChannels *obtfm,
-                                       const short protectflag);
+ void BKE_object_tfm_protected_restore(
+         struct Object *ob,
+         const ObjectTfmProtectedChannels *obtfm,
+         const short protectflag);
  
  /* Dependency graph evaluation callbacks. */
- void BKE_object_eval_local_transform(const struct EvaluationContext *eval_ctx,
-                                      struct Object *ob);
- void BKE_object_eval_parent(const struct EvaluationContext *eval_ctx,
-                             struct Scene *scene,
-                             struct Object *ob);
- void BKE_object_eval_constraints(const struct EvaluationContext *eval_ctx,
-                                  struct Scene *scene,
-                                  struct Object *ob);
+ void BKE_object_eval_local_transform(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Object *ob);
+ void BKE_object_eval_parent(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Scene *scene,
+         struct Object *ob);
+ void BKE_object_eval_constraints(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Scene *scene,
+         struct Object *ob);
 -void BKE_object_eval_done(struct EvaluationContext *eval_ctx, struct Object 
*ob);
 +void BKE_object_eval_done(const struct EvaluationContext *eval_ctx, struct 
Object *ob);
  
- bool BKE_object_eval_proxy_copy(const struct EvaluationContext *eval_ct,
-                                 struct Object *object);
- void BKE_object_eval_uber_transform(const struct EvaluationContext *eval_ctx,
-                                     struct Object *ob);
- void BKE_object_eval_uber_data(const struct EvaluationContext *eval_ctx,
-                                struct Scene *scene,
-                                struct Object *ob);
+ bool BKE_object_eval_proxy_copy(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Object *object);
+ void BKE_object_eval_uber_transform(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Object *ob);
+ void BKE_object_eval_uber_data(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Scene *scene,
+         struct Object *ob);
  
- void BKE_object_eval_cloth(const struct EvaluationContext *eval_ctx,
-                            struct Scene *scene,
-                            struct Object *object);
+ void BKE_object_eval_cloth(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Scene *scene,
+         struct Object *object);
  
- void BKE_object_eval_transform_all(const struct EvaluationContext *eval_ctx,
-                                    struct Scene *scene,
-                                    struct Object *object);
 -
+ void BKE_object_eval_transform_all(
 -        struct EvaluationContext *eval_ctx,
++        const struct EvaluationContext *eval_ctx,
+         struct Scene *scene,
+         struct Object *object);
  
- void BKE_object_eval_update_shading(const struct EvaluationContext *eval_ctx,
-                                     struct Object *object);
- void BKE_object_data_select_update(const struct EvaluationContext *eval_ctx,
-                                    struct ID *object_data);
++void BKE_object_eval_update_shading(
++        const struct EvaluationContext *eval_ctx,
++        struct Object *object);
++void BKE_object_data_select_update(
++        const struct EvaluationContext *eval_ctx,
++        struct ID *object_data);
 +
- void BKE_object_eval_flush_base_flags(const struct EvaluationContext 
*eval_ctx,
-                                       struct Object *object, struct Base 
*base,
-                                       const bool is_from_set);
++void BKE_object_eval_flush_base_flags(
++        const struct EvaluationContext *eval_ctx,
++        struct Object *object, struct Base *base,
++        const bool is_from_set);
 +
  void BKE_object_handle_data_update(
 -        struct EvaluationContext *eval_ctx,
 +        const struct EvaluationContext *eval_ctx,
          struct Scene *scene,
          struct Object *ob);
 -void BKE_object_handle_update(struct EvaluationContext *eval_ctx, struct 
Scene *scene, struct Object *ob);
 +void BKE_object_handle_update(
 +        const struct EvaluationContext *eval_ctx,
 +        struct Scene *scene, struct Object *ob);
  void BKE_object_handle_update_ex(
 -        struct EvaluationContext *eval_ctx,
 +        const struct EvaluationContext *eval_ctx,
          struct Scene *scene, struct Object *ob,
          struct RigidBodyWorld *rbw,
          const bool do_proxy_update);
@@@ -289,16 -272,19 +310,18 @@@ typedef enum eObjectSet 
        OB_SET_ALL       /* All Objects      */
  } eObjectSet;
  
- struct LinkNode *BKE_object_relational_superset(struct ViewLayer *view_layer, 
eObjectSet objectSet, eObRelationTypes includeFilter);
+ struct LinkNod

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to