archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: rename BASE_FROMDUPLI -> BASE_FROM_DUPLI

Browse Source 
Matches `BASE_FROM_SET`.
This commit is contained in:
Campbell Barton
2019-01-15 23:27:54 +11:00
parent b8e8c0e325
commit 2d98dce7ee
17 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/mball.c
View File

@@ -422,7 +422,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis)
for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
for (Base *base = view_layer->object_bases.first; base; base = base->next) {
Object *ob = base->object;
if ((ob->type == OB_MBALL) && !(base->flag & BASE_FROMDUPLI)) {
if ((ob->type == OB_MBALL) && !(base->flag & BASE_FROM_DUPLI)) {
if (ob != bob) {
BLI_split_name_num(obname, &obnr, ob->id.name + 2, '.');

2
source/blender/blenkernel/intern/object.c
View File

@@ -542,7 +542,7 @@ void BKE_object_free_caches(Object *object)
* object created by dependency graph, which shares pointers with original
* object. In this case we can not free anything.
*/
if ((object->base_flag & BASE_FROMDUPLI) == 0) {
if ((object->base_flag & BASE_FROM_DUPLI) == 0) {
BKE_object_free_derived_caches(object);
update_flag |= ID_RECALC_GEOMETRY;
}

2
source/blender/depsgraph/intern/depsgraph_query_iter.cc
View File

@@ -155,7 +155,7 @@ bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
Object *temp_dupli_object = &data->temp_dupli_object;
*temp_dupli_object = *dob->ob;
temp_dupli_object->select_color = dupli_parent->select_color;
temp_dupli_object->base_flag = dupli_parent->base_flag | BASE_FROMDUPLI;
temp_dupli_object->base_flag = dupli_parent->base_flag | BASE_FROM_DUPLI;
temp_dupli_object->base_local_view_bits = dupli_parent->base_local_view_bits;
/* Duplicated elements shouldn't care whether their original collection is visible or not. */

2
source/blender/draw/engines/eevee/eevee_engine.c
View File

@@ -145,7 +145,7 @@ void EEVEE_cache_populate(void *vedata, Object *ob)
/* do not add any scene light sources to the cache */
}
else if (ob->type == OB_LIGHTPROBE) {
if ((ob->base_flag & BASE_FROMDUPLI) != 0) {
if ((ob->base_flag & BASE_FROM_DUPLI) != 0) {
/* TODO: Special case for dupli objects because we cannot save the object pointer. */
}
else {

4
source/blender/draw/engines/eevee/eevee_lights.c
View File

@@ -351,7 +351,7 @@ void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob)
eevee_light_setup(ob, evli);
/* We do not support shadowmaps for dupli lamps. */
if ((ob->base_flag & BASE_FROMDUPLI) != 0) {
if ((ob->base_flag & BASE_FROM_DUPLI) != 0) {
linfo->num_light++;
return;
}
@@ -463,7 +463,7 @@ void EEVEE_lights_cache_shcaster_material_add(
/* Make that object update shadow casting lamps inside its influence bounding box. */
void EEVEE_lights_cache_shcaster_object_add(EEVEE_ViewLayerData *sldata, Object *ob)
{
if ((ob->base_flag & BASE_FROMDUPLI) != 0) {
if ((ob->base_flag & BASE_FROM_DUPLI) != 0) {
/* TODO: Special case for dupli objects because we cannot save the object pointer. */
return;
}

2
source/blender/draw/engines/eevee/eevee_materials.c
View File

@@ -1547,7 +1547,7 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld
/* XXX TODO rewrite this to include the dupli objects.
* This means we cannot exclude dupli objects from reflections!!! */
if ((ob->base_flag & BASE_FROMDUPLI) == 0) {
if ((ob->base_flag & BASE_FROM_DUPLI) == 0) {
oedata = EEVEE_object_data_ensure(ob);
oedata->ob = ob;
oedata->test_data = &sldata->probes->vis_data;

2
source/blender/draw/engines/eevee/eevee_volumes.c
View File

@@ -497,7 +497,7 @@ void EEVEE_volumes_cache_object_add(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved
DRW_shgroup_uniform_vec3(grp, "volumeOrcoSize", texcosize, 1);
/* Smoke Simulation */
if (((ob->base_flag & BASE_FROMDUPLI) == 0) &&
if (((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
(md = modifiers_findByType(ob, eModifierType_Smoke)) &&
(modifier_isEnabled(scene, md, eModifierMode_Realtime)))
{

2
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
View File

@@ -77,7 +77,7 @@ tGPencilObjectCache *gpencil_object_cache_add(
cache_elem->idx = *gp_cache_used;
/* object is duplicated (particle) */
cache_elem->is_dup_ob = ob->base_flag & BASE_FROMDUPLI;
cache_elem->is_dup_ob = ob->base_flag & BASE_FROM_DUPLI;
/* save FXs */
cache_elem->pixfactor = cache_elem->gpd->pixfactor;

2
source/blender/draw/engines/workbench/workbench_deferred.c
View File

@@ -802,7 +802,7 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
}
ModifierData *md;
if (((ob->base_flag & BASE_FROMDUPLI) == 0) &&
if (((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
(md = modifiers_findByType(ob, eModifierType_Smoke)) &&
(modifier_isEnabled(scene, md, eModifierMode_Realtime)) &&
(((SmokeModifierData *)md)->domain != NULL))

2
source/blender/draw/engines/workbench/workbench_forward.c
View File

@@ -483,7 +483,7 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
}
ModifierData *md;
if (((ob->base_flag & BASE_FROMDUPLI) == 0) &&
if (((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
(md = modifiers_findByType(ob, eModifierType_Smoke)) &&
(modifier_isEnabled(scene, md, eModifierMode_Realtime)) &&
(((SmokeModifierData *)md)->domain != NULL))

2
source/blender/draw/intern/draw_armature.c
View File

@@ -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);

2
source/blender/draw/intern/draw_common.c
View File

@@ -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;

8
source/blender/draw/intern/draw_manager.c
View File

@@ -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);
}

16
source/blender/draw/modes/object_mode.c
View File

@@ -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);
}

2
source/blender/draw/modes/overlay_mode.c
View File

@@ -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;

2
source/blender/makesdna/DNA_layer_types.h
View File

@@ -107,7 +107,7 @@ enum {
/* Runtime evaluated flags. */
BASE_VISIBLE = (1 << 1), /* Object is enabled and visible. */
BASE_SELECTABLE = (1 << 2), /* Object can be selected. */
BASE_FROMDUPLI = (1 << 3), /* Object comes from duplicator. */
BASE_FROM_DUPLI = (1 << 3), /* Object comes from duplicator. */
/* BASE_DEPRECATED = (1 << 4), */
BASE_FROM_SET = (1 << 5), /* Object comes from set. */
BASE_ENABLED_VIEWPORT = (1 << 6), /* Object is enabled in viewport. */

2
source/blender/makesrna/intern/rna_object.c
View File

@@ -2807,7 +2807,7 @@ static void rna_def_object(BlenderRNA *brna)
/* Base Settings */
prop = RNA_def_property(srna, "is_from_instancer", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "base_flag", BASE_FROMDUPLI);
RNA_def_property_boolean_sdna(prop, NULL, "base_flag", BASE_FROM_DUPLI);
RNA_def_property_ui_text(prop, "Base from Instancer", "Object comes from a instancer");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);