Commit: 94e7637706add9cf5799e5aeb0332af2fb70cba8
Author: Campbell Barton
Date: Mon Jun 12 21:15:12 2017 +1000
Branches: temp-lightprobe-rename
https://developer.blender.org/rB94e7637706add9cf5799e5aeb0332af2fb70cba8
More missed renaming
===================================================================
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/modes/object_mode.c
M source/blender/editors/object/object_add.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/makesrna/intern/makesrna.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_lightprobe.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache.c
b/source/blender/draw/intern/draw_cache.c
index d7736789a72..45f3b653b66 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -67,7 +67,7 @@ static struct DRWShapeCache {
Batch *drw_lamp_spot;
Batch *drw_lamp_spot_square;
Batch *drw_speaker;
- Batch *drw_probe;
+ Batch *drw_lightprobe;
Batch *drw_bone_octahedral;
Batch *drw_bone_octahedral_wire;
Batch *drw_bone_box;
@@ -117,7 +117,7 @@ void DRW_shape_cache_free(void)
BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp_spot);
BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp_spot_square);
BATCH_DISCARD_ALL_SAFE(SHC.drw_speaker);
- BATCH_DISCARD_ALL_SAFE(SHC.drw_probe);
+ BATCH_DISCARD_ALL_SAFE(SHC.drw_lightprobe);
BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_octahedral);
BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_octahedral_wire);
BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_box);
@@ -1322,10 +1322,10 @@ Batch *DRW_cache_speaker_get(void)
/** \name Probe
* \{ */
-Batch *DRW_cache_probe_get(void)
+Batch *DRW_cache_lightprobe_get(void)
{
#define CIRCLE_RESOL 16
- if (!SHC.drw_probe) {
+ if (!SHC.drw_lightprobe) {
int v_idx = 0;
float v[3] = {0.0f, 1.0f, 0.0f};
/* TODO something nicer than just a circle */
@@ -1363,9 +1363,9 @@ Batch *DRW_cache_probe_get(void)
v[1] = 1.0f;
VertexBuffer_set_attrib(vbo, attr_id.pos, v_idx++, v);
- SHC.drw_probe = Batch_create(PRIM_LINES, vbo, NULL);
+ SHC.drw_lightprobe = Batch_create(PRIM_LINES, vbo, NULL);
}
- return SHC.drw_probe;
+ return SHC.drw_lightprobe;
#undef CIRCLE_RESOL
}
diff --git a/source/blender/draw/intern/draw_cache.h
b/source/blender/draw/intern/draw_cache.h
index 82d6dd9fd32..be05a993316 100644
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@ -79,7 +79,7 @@ struct Batch *DRW_cache_camera_tria_get(void);
struct Batch *DRW_cache_speaker_get(void);
/* Probe */
-struct Batch *DRW_cache_probe_get(void);
+struct Batch *DRW_cache_lightprobe_get(void);
/* Bones */
struct Batch *DRW_cache_bone_octahedral_get(void);
diff --git a/source/blender/draw/modes/object_mode.c
b/source/blender/draw/modes/object_mode.c
index 644a6677052..e1388346008 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -908,7 +908,7 @@ static void OBJECT_cache_init(void *vedata)
/* Probe */
static float probeSize = 10.0f;
- geom = DRW_cache_probe_get();
+ geom = DRW_cache_lightprobe_get();
stl->g_data->probe =
shgroup_instance_screenspace(psl->non_meshes, geom, &probeSize);
/* Camera */
@@ -1408,7 +1408,7 @@ static void DRW_shgroup_speaker(OBJECT_StorageList *stl,
Object *ob, SceneLayer
DRW_shgroup_call_dynamic_add(stl->g_data->speaker, color, &one,
ob->obmat);
}
-static void DRW_shgroup_probe(OBJECT_StorageList *stl, Object *ob, SceneLayer
*sl)
+static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, Object *ob,
SceneLayer *sl)
{
float *color;
LightProbe *prb = (LightProbe *)ob->data;
@@ -1675,7 +1675,7 @@ static void OBJECT_cache_populate(void *vedata, Object
*ob)
DRW_shgroup_speaker(stl, ob, sl);
break;
case OB_LIGHTPROBE:
- DRW_shgroup_probe(stl, ob, sl);
+ DRW_shgroup_lightprobe(stl, ob, sl);
break;
case OB_ARMATURE:
{
diff --git a/source/blender/editors/object/object_add.c
b/source/blender/editors/object/object_add.c
index c9766962b71..2649a6d6d69 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -153,7 +153,7 @@ static EnumPropertyItem field_type_items[] = {
};
/* copy from rna_lightprobe.c */
-static EnumPropertyItem probe_type_items[] = {
+static EnumPropertyItem lightprobe_type_items[] = {
{LIGHTPROBE_TYPE_CUBE, "CUBE", ICON_MESH_UVSPHERE, "Sphere", ""},
// {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_MESH_PLANE, "Planar", ""},
// {LIGHTPROBE_TYPE_IMAGE, "IMAGE", ICON_NONE, "Image", ""},
@@ -556,7 +556,7 @@ void OBJECT_OT_lightprobe_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- ot->prop = RNA_def_enum(ot->srna, "type", probe_type_items, 0, "Type",
"");
+ ot->prop = RNA_def_enum(ot->srna, "type", lightprobe_type_items, 0,
"Type", "");
ED_object_add_unit_props(ot);
ED_object_add_generic_props(ot, true);
diff --git a/source/blender/editors/space_buttons/buttons_context.c
b/source/blender/editors/space_buttons/buttons_context.c
index adaf892369a..2460ba3fc9f 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -779,7 +779,7 @@ void buttons_context_compute(const bContext *C, SpaceButs
*sbuts)
const char *buttons_context_dir[] = {
"texture_slot", "scene", "world", "object", "mesh", "armature",
"lattice", "curve",
- "meta_ball", "lamp", "speaker", "probe", "camera", "material",
"material_slot",
+ "meta_ball", "lamp", "speaker", "lightprobe", "camera", "material",
"material_slot",
"texture", "texture_user", "texture_user_property", "bone", "edit_bone",
"pose_bone", "particle_system", "particle_system_editable",
"particle_settings",
"cloth", "soft_body", "fluid", "smoke", "collision", "brush",
"dynamic_paint",
diff --git a/source/blender/makesrna/intern/makesrna.c
b/source/blender/makesrna/intern/makesrna.c
index 3cdbb320ced..f501f6cbf7e 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -3345,7 +3345,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
{"rna_palette.c", NULL, RNA_def_palette},
{"rna_particle.c", NULL, RNA_def_particle},
{"rna_pose.c", "rna_pose_api.c", RNA_def_pose},
- {"rna_lightprobe.c", NULL, RNA_def_probe},
+ {"rna_lightprobe.c", NULL, RNA_def_lightprobe},
{"rna_property.c", NULL, RNA_def_gameproperty},
{"rna_render.c", NULL, RNA_def_render},
{"rna_rigidbody.c", NULL, RNA_def_rigidbody},
diff --git a/source/blender/makesrna/intern/rna_internal.h
b/source/blender/makesrna/intern/rna_internal.h
index 07d3a352909..e7636d492c4 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -166,7 +166,7 @@ void RNA_def_packedfile(struct BlenderRNA *brna);
void RNA_def_palette(struct BlenderRNA *brna);
void RNA_def_particle(struct BlenderRNA *brna);
void RNA_def_pose(struct BlenderRNA *brna);
-void RNA_def_probe(struct BlenderRNA *brna);
+void RNA_def_lightprobe(struct BlenderRNA *brna);
void RNA_def_render(struct BlenderRNA *brna);
void RNA_def_rigidbody(struct BlenderRNA *brna);
void RNA_def_rna(struct BlenderRNA *brna);
diff --git a/source/blender/makesrna/intern/rna_lightprobe.c
b/source/blender/makesrna/intern/rna_lightprobe.c
index 7d1b6708345..942353d0c07 100644
--- a/source/blender/makesrna/intern/rna_lightprobe.c
+++ b/source/blender/makesrna/intern/rna_lightprobe.c
@@ -62,24 +62,24 @@ static EnumPropertyItem parallax_type_items[] = {
{0, NULL, 0, NULL, NULL}
};
-static EnumPropertyItem probe_type_items[] = {
+static EnumPropertyItem lightprobe_type_items[] = {
{LIGHTPROBE_TYPE_CUBE, "CUBEMAP", ICON_NONE, "Cubemap", ""},
// {LIGHTPROBE_TYPE_PLANAR, "PLANAR", ICON_NONE, "Planar", ""},
// {LIGHTPROBE_TYPE_IMAGE, "IMAGE", ICON_NONE, "Image", ""},
{0, NULL, 0, NULL, NULL}
};
-static void rna_def_probe(BlenderRNA *brna)
+static void rna_def_lightprobe(BlenderRNA *brna)
{
StructRNA *srna;
PropertyRNA *prop;
srna = RNA_def_struct(brna, "LightProbe", "ID");
- RNA_def_struct_ui_text(srna, "LightProbe", "Probe data-block for
lighting capture objects");
+ RNA_def_struct_ui_text(srna, "LightProbe", "Light Probe data-block for
lighting capture objects");
RNA_def_struct_ui_icon(srna, ICON_RADIO);
prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_items(prop, probe_type_items);
+ RNA_def_property_enum_items(prop, lightprobe_type_items);
RNA_def_property_ui_text(prop, "Type", "Type of probe");
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, NULL);
@@ -150,9 +150,9 @@ static void rna_def_probe(BlenderRNA *brna)
}
-void RNA_def_probe(BlenderRNA *brna)
+void RNA_def_lightprobe(BlenderRNA *brna)
{
- rna_def_probe(brna);
+ rna_def_lightprobe(brna);
}
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
