Commit: 2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01
Author: Campbell Barton
Date: Tue Jan 15 23:27:54 2019 +1100
Branches: master
https://developer.blender.org/rB2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01
Cleanup: rename BASE_FROMDUPLI -> BASE_FROM_DUPLI
Matches `BASE_FROM_SET`.
===================================================================
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/object.c
M source/blender/depsgraph/intern/depsgraph_query_iter.cc
M source/blender/draw/engines/eevee/eevee_engine.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_volumes.c
M source/blender/draw/engines/gpencil/gpencil_cache_utils.c
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/draw/engines/workbench/workbench_forward.c
M source/blender/draw/intern/draw_armature.c
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/overlay_mode.c
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesrna/intern/rna_object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mball.c
b/source/blender/blenkernel/intern/mball.c
index cff425dbd1b..5ce080fd4c2 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -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, '.');
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 44d5b29d4aa..4e1ba003228 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -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;
}
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 5b039ce60be..252cfa8be97 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -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. */
diff --git a/source/blender/draw/engines/eevee/eevee_engine.c
b/source/blender/draw/engines/eevee/eevee_engine.c
index 6a2ca982d53..23db700d8d7 100644
--- a/source/blender/draw/engines/eevee/eevee_engine.c
+++ b/source/blender/draw/engines/eevee/eevee_engine.c
@@ -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 {
diff --git a/source/blender/draw/engines/eevee/eevee_lights.c
b/source/blender/draw/engines/eevee/eevee_lights.c
index 67cca698ce7..a41e3ec48f0 100644
--- a/source/blender/draw/engines/eevee/eevee_lights.c
+++ b/source/blender/draw/engines/eevee/eevee_lights.c
@@ -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;
}
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c
b/source/blender/draw/engines/eevee/eevee_materials.c
index 00b77eee19b..00990233cde 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -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;
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c
b/source/blender/draw/engines/eevee/eevee_volumes.c
index 4fffa3f285c..b3042f8fcf8 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -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)))
{
diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
index e733b7e0f1f..fd5e289db61 100644
--- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c
@@ -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;
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c
b/source/blender/draw/engines/workbench/workbench_deferred.c
index cc8254d0f3d..3f537f6c6d0 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -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))
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c
b/source/blender/draw/engines/workbench/workbench_forward.c
index d303f2ea88e..94cbb20ef5f 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -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))
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
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
