diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 15:27:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-15 15:30:31 +0300 |
| commit | 2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01 (patch) | |
| tree | ce9baf87f55adff9f85e96283b6aef2a0176220c /source/blender/draw/intern | |
| parent | b8e8c0e325d213f2dcf4adad5506989fa224716e (diff) | |
Cleanup: rename BASE_FROMDUPLI -> BASE_FROM_DUPLI
Matches `BASE_FROM_SET`.
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_armature.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index 83212a594a9..2e503294643 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -1856,7 +1856,7 @@ static void draw_armature_pose(Object *ob, const float const_color[4]) if (!is_pose_select && show_relations && (arm->flag & ARM_POSEMODE) && (bone->flag & BONE_SELECTED) && - ((ob->base_flag & BASE_FROMDUPLI) == 0) && + ((ob->base_flag & BASE_FROM_DUPLI) == 0) && (pchan->ikflag & (BONE_IK_XLIMIT | BONE_IK_ZLIMIT))) { draw_bone_dofs(pchan); diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 934aebcad83..48212757969 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -909,7 +909,7 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color if (UNLIKELY(ob->base_flag & BASE_FROM_SET)) { *r_color = ts.colorDupli; } - else if (UNLIKELY(ob->base_flag & BASE_FROMDUPLI)) { + else if (UNLIKELY(ob->base_flag & BASE_FROM_DUPLI)) { switch (theme_id) { case TH_ACTIVE: case TH_SELECT: *r_color = ts.colorDupliSelect; break; diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 0efa98abeae..7ba73c28c0c 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -878,7 +878,7 @@ DrawData *DRW_drawdata_ensure( DrawDataList *drawdata = DRW_drawdatalist_from_id(id); /* Allocate new data. */ - if ((GS(id->name) == ID_OB) && (((Object *)id)->base_flag & BASE_FROMDUPLI) != 0) { + if ((GS(id->name) == ID_OB) && (((Object *)id)->base_flag & BASE_FROM_DUPLI) != 0) { /* NOTE: data is not persistent in this case. It is reset each redraw. */ BLI_assert(free_cb == NULL); /* No callback allowed. */ /* Round to sizeof(float) for DRW_instance_data_request(). */ @@ -925,7 +925,7 @@ void DRW_drawdata_free(ID *id) /* Unlink (but don't free) the drawdata from the DrawDataList if the ID is an OB from dupli. */ static void drw_drawdata_unlink_dupli(ID *id) { - if ((GS(id->name) == ID_OB) && (((Object *)id)->base_flag & BASE_FROMDUPLI) != 0) { + if ((GS(id->name) == ID_OB) && (((Object *)id)->base_flag & BASE_FROM_DUPLI) != 0) { DrawDataList *drawdata = DRW_drawdatalist_from_id(id); if (drawdata == NULL) @@ -2134,7 +2134,7 @@ void DRW_draw_select_loop( (object_type_exclude_select & (1 << ob->type)) == 0) { if (object_filter_fn != NULL) { - if (ob->base_flag & BASE_FROMDUPLI) { + if (ob->base_flag & BASE_FROM_DUPLI) { /* pass (use previous filter_exclude value) */ } else { @@ -2146,7 +2146,7 @@ void DRW_draw_select_loop( } /* This relies on dupli instances being after their instancing object. */ - if ((ob->base_flag & BASE_FROMDUPLI) == 0) { + if ((ob->base_flag & BASE_FROM_DUPLI) == 0) { Object *ob_orig = DEG_get_original_object(ob); DRW_select_load_id(ob_orig->select_color); } |