[Bf-blender-cvs] [2466afd089e] blender2.8: Cleanup: Use full name for scene_layer in makesrna
Sergey Sharybin
noreply at git.blender.org
Thu Nov 9 15:47:24 CET 2017
Commit: 2466afd089ee370c7b6ccb288fc38fdcc6152805
Author: Sergey Sharybin
Date: Thu Nov 9 15:32:01 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB2466afd089ee370c7b6ccb288fc38fdcc6152805
Cleanup: Use full name for scene_layer in makesrna
===================================================================
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_texture.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index b7d108fc769..52b70b151ab 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -375,9 +375,9 @@ static void rna_Brush_main_tex_update(bContext *C, PointerRNA *ptr)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- SceneLayer *sl = CTX_data_scene_layer(C);
+ SceneLayer *scene_layer = CTX_data_scene_layer(C);
Brush *br = (Brush *)ptr->data;
- BKE_paint_invalidate_overlay_tex(scene, sl, br->mtex.tex);
+ BKE_paint_invalidate_overlay_tex(scene, scene_layer, br->mtex.tex);
rna_Brush_update(bmain, scene, ptr);
}
@@ -385,9 +385,9 @@ static void rna_Brush_secondary_tex_update(bContext *C, PointerRNA *ptr)
{
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
- SceneLayer *sl = CTX_data_scene_layer(C);
+ SceneLayer *scene_layer = CTX_data_scene_layer(C);
Brush *br = (Brush *)ptr->data;
- BKE_paint_invalidate_overlay_tex(scene, sl, br->mask_mtex.tex);
+ BKE_paint_invalidate_overlay_tex(scene, scene_layer, br->mask_mtex.tex);
rna_Brush_update(bmain, scene, ptr);
}
@@ -449,8 +449,8 @@ static void rna_TextureSlot_brush_angle_update(bContext *C, PointerRNA *ptr)
MTex *mtex = ptr->data;
/* skip invalidation of overlay for stencil mode */
if (mtex->mapping != MTEX_MAP_MODE_STENCIL) {
- SceneLayer *sl = CTX_data_scene_layer(C);
- BKE_paint_invalidate_overlay_tex(scene, sl, mtex->tex);
+ SceneLayer *scene_layer = CTX_data_scene_layer(C);
+ BKE_paint_invalidate_overlay_tex(scene, scene_layer, mtex->tex);
}
rna_TextureSlot_update(C, ptr);
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index ec9b8cc24b2..b20840ea254 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -412,7 +412,7 @@ PointerRNA rna_pointer_inherit_refine(struct PointerRNA *ptr, struct StructRNA *
int rna_parameter_size(struct PropertyRNA *parm);
struct Mesh *rna_Main_meshes_new_from_object(
- struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct SceneLayer *sl,
+ struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct SceneLayer *scene_layer,
struct Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed);
/* XXX, these should not need to be defined here~! */
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index 2fffc3a6c8f..100b08e38ef 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -423,8 +423,8 @@ static void rna_LayerCollectionEngineSettings_update(bContext *C, PointerRNA *UN
static void rna_LayerCollectionEngineSettings_wire_update(bContext *C, PointerRNA *UNUSED(ptr))
{
Scene *scene = CTX_data_scene(C);
- SceneLayer *sl = CTX_data_scene_layer(C);
- Object *ob = OBACT_NEW(sl);
+ SceneLayer *scene_layer = CTX_data_scene_layer(C);
+ Object *ob = OBACT_NEW(scene_layer);
if (ob != NULL && ob->type == OB_MESH) {
BKE_mesh_batch_cache_dirty(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
@@ -720,45 +720,45 @@ static void rna_LayerCollection_enable_set(
static int rna_LayerCollections_active_collection_index_get(PointerRNA *ptr)
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
- return sl->active_collection;
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+ return scene_layer->active_collection;
}
static void rna_LayerCollections_active_collection_index_set(PointerRNA *ptr, int value)
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
- int num_collections = BKE_layer_collection_count(sl);
- sl->active_collection = min_ff(value, num_collections - 1);
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+ int num_collections = BKE_layer_collection_count(scene_layer);
+ scene_layer->active_collection = min_ff(value, num_collections - 1);
}
static void rna_LayerCollections_active_collection_index_range(
PointerRNA *ptr, int *min, int *max, int *UNUSED(softmin), int *UNUSED(softmax))
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
*min = 0;
- *max = max_ii(0, BKE_layer_collection_count(sl) - 1);
+ *max = max_ii(0, BKE_layer_collection_count(scene_layer) - 1);
}
static PointerRNA rna_LayerCollections_active_collection_get(PointerRNA *ptr)
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
- LayerCollection *lc = BKE_layer_collection_get_active(sl);
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+ LayerCollection *lc = BKE_layer_collection_get_active(scene_layer);
return rna_pointer_inherit_refine(ptr, &RNA_LayerCollection, lc);
}
static void rna_LayerCollections_active_collection_set(PointerRNA *ptr, PointerRNA value)
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
LayerCollection *lc = (LayerCollection *)value.data;
- const int index = BKE_layer_collection_findindex(sl, lc);
- if (index != -1) sl->active_collection = index;
+ const int index = BKE_layer_collection_findindex(scene_layer, lc);
+ if (index != -1) scene_layer->active_collection = index;
}
LayerCollection * rna_SceneLayer_collection_link(
- ID *id, SceneLayer *sl, Main *bmain, SceneCollection *sc)
+ ID *id, SceneLayer *scene_layer, Main *bmain, SceneCollection *sc)
{
Scene *scene = (Scene *)id;
- LayerCollection *lc = BKE_collection_link(sl, sc);
+ LayerCollection *lc = BKE_collection_link(scene_layer, sc);
DEG_relations_tag_update(bmain);
/* TODO(sergey): Use proper flag for tagging here. */
@@ -769,16 +769,17 @@ LayerCollection * rna_SceneLayer_collection_link(
}
static void rna_SceneLayer_collection_unlink(
- ID *id, SceneLayer *sl, Main *bmain, ReportList *reports, LayerCollection *lc)
+ ID *id, SceneLayer *scene_layer, Main *bmain, ReportList *reports, LayerCollection *lc)
{
Scene *scene = (Scene *)id;
- if (BLI_findindex(&sl->layer_collections, lc) == -1) {
- BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is not in '%s'", lc->scene_collection->name, sl->name);
+ if (BLI_findindex(&scene_layer->layer_collections, lc) == -1) {
+ BKE_reportf(reports, RPT_ERROR, "Layer collection '%s' is not in '%s'",
+ lc->scene_collection->name, scene_layer->name);
return;
}
- BKE_collection_unlink(sl, lc);
+ BKE_collection_unlink(scene_layer, lc);
DEG_relations_tag_update(bmain);
/* TODO(sergey): Use proper flag for tagging here. */
@@ -788,38 +789,38 @@ static void rna_SceneLayer_collection_unlink(
static PointerRNA rna_LayerObjects_active_object_get(PointerRNA *ptr)
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
- return rna_pointer_inherit_refine(ptr, &RNA_Object, sl->basact ? sl->basact->object : NULL);
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+ return rna_pointer_inherit_refine(ptr, &RNA_Object, scene_layer->basact ? scene_layer->basact->object : NULL);
}
static void rna_LayerObjects_active_object_set(PointerRNA *ptr, PointerRNA value)
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
if (value.data)
- sl->basact = BKE_scene_layer_base_find(sl, (Object *)value.data);
+ scene_layer->basact = BKE_scene_layer_base_find(scene_layer, (Object *)value.data);
else
- sl->basact = NULL;
+ scene_layer->basact = NULL;
}
static void rna_SceneLayer_name_set(PointerRNA *ptr, const char *value)
{
Scene *scene = (Scene *)ptr->id.data;
- SceneLayer *sl = (SceneLayer *)ptr->data;
- char oldname[sizeof(sl->name)];
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+ char oldname[sizeof(scene_layer->name)];
- BLI_strncpy(oldname, sl->name, sizeof(sl->name));
+ BLI_strncpy(oldname, scene_layer->name, sizeof(scene_layer->name));
- BLI_strncpy_utf8(sl->name, value, sizeof(sl->name));
- BLI_uniquename(&scene->render_layers, sl, DATA_("SceneLayer"), '.', offsetof(SceneLayer, name), sizeof(sl->name));
+ BLI_strncpy_utf8(scene_layer->name, value, sizeof(scene_layer->name));
+ BLI_uniquename(&scene->render_layers, scene_layer, DATA_("SceneLayer"), '.', offsetof(SceneLayer, name), sizeof(scene_layer->name));
if (scene->nodetree) {
bNode *node;
- int index = BLI_findindex(&scene->render_layers, sl);
+ int index = BLI_findindex(&scene->render_layers, scene_layer);
for (node = scene->nodetree->nodes.first; node; node = node->next) {
if (node->type == CMP_NODE_R_LAYERS && node->id == NULL) {
if (node->custom1 == index)
- BLI_strncpy(node->name, sl->name, NODE_MAXSTR);
+ BLI_strncpy(node->name, scene_layer->name, NODE_MAXSTR);
}
}
}
@@ -856,11 +857,11 @@ static PointerRNA rna_SceneLayer_depsgraph_get(PointerRNA *ptr)
static void rna_LayerObjects_selected_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
{
- SceneLayer *sl = (SceneLayer *)ptr->data;
- rna_iterator_listbase_begin(iter, &sl->object_bases, rna_SceneLayer_objects_selected_skip);
+ SceneLayer *scene_layer = (SceneLayer *)ptr->data;
+ rna_iterator_listbase_begin(iter, &scene_layer->object_bases, rna_SceneLayer_objects_selected_skip);
}
-static void rna_SceneLayer_update_tagged(SceneLayer *UNUSED(sl), bContext *C)
+static void rna_SceneLayer_update_tagged(SceneLayer *UNUSED(scene_layer), bContext *C)
{
Depsgraph *graph = CTX_data_depsgraph(C);
DEG_OBJECT_ITER(graph, ob, DEG_OBJECT_ITER_FLAG_ALL)
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 52b953549ba..3f0b213efac 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -301,14 +301,14 @@ static Mesh *rna_Main_meshes_new(Main *bmain, const char *name)
/* copied from Mesh_getFromObject and adapted to RNA interface */
/* settings: 1 - preview, 2 - render */
Mesh *rna_Main_meshes_new_from_object(
- Main *bmain, ReportList *reports, Scene *sce, SceneLayer *sl,
+ Main *bmain, ReportList *reports, Scene *sce, SceneLayer *scene_layer,
Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_und
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list