Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-01-15 15:27:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-15 15:30:31 +0300
commit2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01 (patch)
treece9baf87f55adff9f85e96283b6aef2a0176220c /source/blender/draw/modes
parentb8e8c0e325d213f2dcf4adad5506989fa224716e (diff)
Cleanup: rename BASE_FROMDUPLI -> BASE_FROM_DUPLI
Matches `BASE_FROM_SET`.
Diffstat (limited to 'source/blender/draw/modes')
-rw-r--r--source/blender/draw/modes/object_mode.c16
-rw-r--r--source/blender/draw/modes/overlay_mode.c2
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 0f69e248409..aef4823b2ee 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -713,7 +713,7 @@ static DRWShadingGroup *shgroup_points(DRWPass *pass, const float col[4], GPUSha
static int *shgroup_theme_id_to_probe_outline_counter(
OBJECT_StorageList *stl, int theme_id, const int base_flag)
{
- if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+ if (UNLIKELY(base_flag & BASE_FROM_DUPLI)) {
switch (theme_id) {
case TH_ACTIVE:
case TH_SELECT:
@@ -738,7 +738,7 @@ static int *shgroup_theme_id_to_probe_outline_counter(
static int *shgroup_theme_id_to_outline_counter(
OBJECT_StorageList *stl, int theme_id, const int base_flag)
{
- if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+ if (UNLIKELY(base_flag & BASE_FROM_DUPLI)) {
switch (theme_id) {
case TH_ACTIVE:
case TH_SELECT:
@@ -779,7 +779,7 @@ static DRWShadingGroup *shgroup_theme_id_to_probe_cube_outline_shgrp(
OBJECT_StorageList *stl, int theme_id, const int base_flag)
{
/* does not increment counter */
- if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+ if (UNLIKELY(base_flag & BASE_FROM_DUPLI)) {
switch (theme_id) {
case TH_ACTIVE:
case TH_SELECT:
@@ -807,7 +807,7 @@ static DRWShadingGroup *shgroup_theme_id_to_outline_or_null(
int *counter = shgroup_theme_id_to_outline_counter(stl, theme_id, base_flag);
*counter += 1;
- if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+ if (UNLIKELY(base_flag & BASE_FROM_DUPLI)) {
switch (theme_id) {
case TH_ACTIVE:
case TH_SELECT:
@@ -837,7 +837,7 @@ static DRWShadingGroup *shgroup_theme_id_to_wire(
if (UNLIKELY(base_flag & BASE_FROM_SET)) {
return sgl->wire_dupli;
}
- else if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+ else if (UNLIKELY(base_flag & BASE_FROM_DUPLI)) {
switch (theme_id) {
case TH_ACTIVE:
case TH_SELECT:
@@ -867,7 +867,7 @@ static DRWShadingGroup *shgroup_theme_id_to_point(
if (UNLIKELY(base_flag & BASE_FROM_SET)) {
return sgl->points_dupli;
}
- else if (UNLIKELY(base_flag & BASE_FROMDUPLI)) {
+ else if (UNLIKELY(base_flag & BASE_FROM_DUPLI)) {
switch (theme_id) {
case TH_ACTIVE:
case TH_SELECT:
@@ -1512,7 +1512,7 @@ static void DRW_shgroup_lamp(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLayer
float (*shapemat)[4] = lamp_engine_data->shape_mat;
float (*spotblendmat)[4] = lamp_engine_data->spot_blend_mat;
- if ((ob->base_flag & (BASE_FROM_SET | BASE_FROMDUPLI)) == 0) {
+ if ((ob->base_flag & (BASE_FROM_SET | BASE_FROM_DUPLI)) == 0) {
/* Don't draw the center if it's selected or active */
if (theme_id == TH_LAMP) {
DRW_shgroup_call_dynamic_add(sgl->lamp_center, ob->obmat[3]);
@@ -3119,7 +3119,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
}
/* don't show object extras in set's */
- if ((ob->base_flag & (BASE_FROM_SET | BASE_FROMDUPLI)) == 0) {
+ if ((ob->base_flag & (BASE_FROM_SET | BASE_FROM_DUPLI)) == 0) {
if ((draw_ctx->object_mode & (OB_MODE_ALL_PAINT | OB_MODE_ALL_PAINT_GPENCIL)) == 0) {
DRW_shgroup_object_center(stl, ob, view_layer, v3d);
}
diff --git a/source/blender/draw/modes/overlay_mode.c b/source/blender/draw/modes/overlay_mode.c
index dd8f580a8c3..274843ac289 100644
--- a/source/blender/draw/modes/overlay_mode.c
+++ b/source/blender/draw/modes/overlay_mode.c
@@ -252,7 +252,7 @@ static void overlay_cache_populate(void *vedata, Object *ob)
rim_col = ts.colorDupli;
wire_col = ts.colorDupli;
}
- else if (UNLIKELY(ob->base_flag & BASE_FROMDUPLI)) {
+ else if (UNLIKELY(ob->base_flag & BASE_FROM_DUPLI)) {
if (ob->base_flag & BASE_SELECTED) {
if (G.moving & G_TRANSFORM_OBJ) {
rim_col = ts.colorTransform;