[Bf-blender-cvs] [dec459e4242] master: Cleanup: move some files that use nodes to C++
Jacques Lucke
noreply at git.blender.org
Fri Nov 18 11:09:17 CET 2022
Commit: dec459e4242965cae497fe119ffbc5e9be66be20
Author: Jacques Lucke
Date: Fri Nov 18 11:08:39 2022 +0100
Branches: master
https://developer.blender.org/rBdec459e4242965cae497fe119ffbc5e9be66be20
Cleanup: move some files that use nodes to C++
===================================================================
M source/blender/blenkernel/CMakeLists.txt
R094 source/blender/blenkernel/intern/layer.c source/blender/blenkernel/intern/layer.cc
R094 source/blender/blenkernel/intern/linestyle.c source/blender/blenkernel/intern/linestyle.cc
R085 source/blender/blenkernel/intern/material.c source/blender/blenkernel/intern/material.cc
R086 source/blender/blenkernel/intern/texture.c source/blender/blenkernel/intern/texture.cc
M source/blender/draw/CMakeLists.txt
R078 source/blender/draw/engines/eevee/eevee_shaders.c source/blender/draw/engines/eevee/eevee_shaders.cc
R093 source/blender/draw/engines/workbench/workbench_materials.c source/blender/draw/engines/workbench/workbench_materials.cc
M source/blender/editors/space_buttons/CMakeLists.txt
M source/blender/editors/space_buttons/buttons_intern.h
R085 source/blender/editors/space_buttons/buttons_texture.c source/blender/editors/space_buttons/buttons_texture.cc
M source/blender/gpu/CMakeLists.txt
R091 source/blender/gpu/intern/gpu_node_graph.c source/blender/gpu/intern/gpu_node_graph.cc
===================================================================
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 59d58ed2f98..584da275c9f 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -168,7 +168,7 @@ set(SRC
intern/keyconfig.c
intern/lattice.c
intern/lattice_deform.c
- intern/layer.c
+ intern/layer.cc
intern/layer_utils.c
intern/lib_id.c
intern/lib_id_delete.c
@@ -181,14 +181,14 @@ set(SRC
intern/library.c
intern/light.c
intern/lightprobe.c
- intern/linestyle.c
+ intern/linestyle.cc
intern/main.c
intern/main_idmap.c
intern/main_namemap.cc
intern/mask.c
intern/mask_evaluate.c
intern/mask_rasterize.c
- intern/material.c
+ intern/material.cc
intern/mball.cc
intern/mball_tessellate.cc
intern/mesh.cc
@@ -282,7 +282,7 @@ set(SRC
intern/subsurf_ccg.c
intern/text.c
intern/text_suggestions.c
- intern/texture.c
+ intern/texture.cc
intern/tracking.c
intern/tracking_auto.c
intern/tracking_detect.c
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.cc
similarity index 94%
rename from source/blender/blenkernel/intern/layer.c
rename to source/blender/blenkernel/intern/layer.cc
index 5b54f16661c..47a6d6f7bd4 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.cc
@@ -71,7 +71,7 @@ static void object_bases_iterator_next(BLI_Iterator *iter, const int flag);
static LayerCollection *layer_collection_add(ListBase *lb_parent, Collection *collection)
{
- LayerCollection *lc = MEM_callocN(sizeof(LayerCollection), "Collection Base");
+ LayerCollection *lc = MEM_cnew<LayerCollection>("Collection Base");
lc->collection = collection;
lc->local_collections_bits = ~(0);
BLI_addtail(lb_parent, lc);
@@ -94,7 +94,7 @@ static void layer_collection_free(ViewLayer *view_layer, LayerCollection *lc)
static Base *object_base_new(Object *ob)
{
- Base *base = MEM_callocN(sizeof(Base), "Object Base");
+ Base *base = MEM_cnew<Base>("Object Base");
base->object = ob;
base->local_view_bits = ~(0);
if (ob->base_flag & BASE_SELECTED) {
@@ -120,7 +120,7 @@ ViewLayer *BKE_view_layer_default_view(const Scene *scene)
}
BLI_assert(scene->view_layers.first);
- return scene->view_layers.first;
+ return static_cast<ViewLayer *>(scene->view_layers.first);
}
ViewLayer *BKE_view_layer_default_render(const Scene *scene)
@@ -132,7 +132,7 @@ ViewLayer *BKE_view_layer_default_render(const Scene *scene)
}
BLI_assert(scene->view_layers.first);
- return scene->view_layers.first;
+ return static_cast<ViewLayer *>(scene->view_layers.first);
}
ViewLayer *BKE_view_layer_find(const Scene *scene, const char *layer_name)
@@ -149,7 +149,7 @@ ViewLayer *BKE_view_layer_find(const Scene *scene, const char *layer_name)
ViewLayer *BKE_view_layer_context_active_PLACEHOLDER(const Scene *scene)
{
BLI_assert(scene->view_layers.first);
- return scene->view_layers.first;
+ return static_cast<ViewLayer *>(scene->view_layers.first);
}
static ViewLayer *view_layer_add(const char *name)
@@ -158,7 +158,7 @@ static ViewLayer *view_layer_add(const char *name)
name = DATA_("ViewLayer");
}
- ViewLayer *view_layer = MEM_callocN(sizeof(ViewLayer), "View Layer");
+ ViewLayer *view_layer = MEM_cnew<ViewLayer>("View Layer");
view_layer->flag = VIEW_LAYER_RENDER | VIEW_LAYER_FREESTYLE;
BLI_strncpy_utf8(view_layer->name, name, sizeof(view_layer->name));
@@ -176,7 +176,8 @@ static ViewLayer *view_layer_add(const char *name)
static void layer_collection_exclude_all(LayerCollection *layer_collection)
{
- LayerCollection *sub_collection = layer_collection->layer_collections.first;
+ LayerCollection *sub_collection = static_cast<LayerCollection *>(
+ layer_collection->layer_collections.first);
for (; sub_collection != NULL; sub_collection = sub_collection->next) {
sub_collection->flag |= LAYER_COLLECTION_EXCLUDE;
layer_collection_exclude_all(sub_collection);
@@ -204,7 +205,7 @@ ViewLayer *BKE_view_layer_add(Scene *scene,
}
case VIEWLAYER_ADD_COPY: {
/* Allocate and copy view layer data */
- view_layer_new = MEM_callocN(sizeof(ViewLayer), "View Layer");
+ view_layer_new = MEM_cnew<ViewLayer>("View Layer");
*view_layer_new = *view_layer_source;
BKE_view_layer_copy_data(scene, scene, view_layer_new, view_layer_source, 0);
BLI_addtail(&scene->view_layers, view_layer_new);
@@ -218,7 +219,8 @@ ViewLayer *BKE_view_layer_add(Scene *scene,
/* Initialize layer-collections. */
BKE_layer_collection_sync(scene, view_layer_new);
- layer_collection_exclude_all(view_layer_new->layer_collections.first);
+ layer_collection_exclude_all(
+ static_cast<LayerCollection *>(view_layer_new->layer_collections.first));
/* Update collections after changing visibility */
BKE_layer_collection_sync(scene, view_layer_new);
@@ -387,7 +389,7 @@ Base *BKE_view_layer_base_find(ViewLayer *view_layer, Object *ob)
view_layer_bases_hash_create(view_layer, false);
}
- return BLI_ghash_lookup(view_layer->object_bases_hash, ob);
+ return static_cast<Base *>(BLI_ghash_lookup(view_layer->object_bases_hash, ob));
}
void BKE_view_layer_base_deselect_all(const Scene *scene, ViewLayer *view_layer)
@@ -421,8 +423,8 @@ static void layer_aov_copy_data(ViewLayer *view_layer_dst,
BLI_duplicatelist(aovs_dst, aovs_src);
}
- ViewLayerAOV *aov_dst = aovs_dst->first;
- const ViewLayerAOV *aov_src = aovs_src->first;
+ ViewLayerAOV *aov_dst = static_cast<ViewLayerAOV *>(aovs_dst->first);
+ const ViewLayerAOV *aov_src = static_cast<const ViewLayerAOV *>(aovs_src->first);
while (aov_dst != NULL) {
BLI_assert(aov_src);
@@ -444,8 +446,9 @@ static void layer_lightgroup_copy_data(ViewLayer *view_layer_dst,
BLI_duplicatelist(lightgroups_dst, lightgroups_src);
}
- ViewLayerLightgroup *lightgroup_dst = lightgroups_dst->first;
- const ViewLayerLightgroup *lightgroup_src = lightgroups_src->first;
+ ViewLayerLightgroup *lightgroup_dst = static_cast<ViewLayerLightgroup *>(lightgroups_dst->first);
+ const ViewLayerLightgroup *lightgroup_src = static_cast<const ViewLayerLightgroup *>(
+ lightgroups_src->first);
while (lightgroup_dst != NULL) {
BLI_assert(lightgroup_src);
@@ -465,8 +468,10 @@ static void layer_collections_copy_data(ViewLayer *view_layer_dst,
{
BLI_duplicatelist(layer_collections_dst, layer_collections_src);
- LayerCollection *layer_collection_dst = layer_collections_dst->first;
- const LayerCollection *layer_collection_src = layer_collections_src->first;
+ LayerCollection *layer_collection_dst = static_cast<LayerCollection *>(
+ layer_collections_dst->first);
+ const LayerCollection *layer_collection_src = static_cast<const LayerCollection *>(
+ layer_collections_src->first);
while (layer_collection_dst != NULL) {
layer_collections_copy_data(view_layer_dst,
@@ -508,7 +513,7 @@ void BKE_view_layer_copy_data(Scene *scene_dst,
BLI_assert_msg((view_layer_src->flag & VIEW_LAYER_OUT_OF_SYNC) == 0,
"View Layer Object Base out of sync, invoke BKE_view_layer_synced_ensure.");
LISTBASE_FOREACH (const Base *, base_src, &view_layer_src->object_bases) {
- Base *base_dst = MEM_dupallocN(base_src);
+ Base *base_dst = static_cast<Base *>(MEM_dupallocN(base_src));
BLI_addtail(&view_layer_dst->object_bases, base_dst);
if (view_layer_src->basact == base_src) {
view_layer_dst->basact = base_dst;
@@ -521,7 +526,8 @@ void BKE_view_layer_copy_data(Scene *scene_dst,
&view_layer_dst->layer_collections,
&view_layer_src->layer_collections);
- LayerCollection *lc_scene_dst = view_layer_dst->layer_collections.first;
+ LayerCollection *lc_scene_dst = static_cast<LayerCollection *>(
+ view_layer_dst->layer_collections.first);
lc_scene_dst->collection = scene_dst->master_collection;
BLI_listbase_clear(&view_layer_dst->aovs);
@@ -555,7 +561,7 @@ void BKE_view_layer_rename(Main *bmain, Scene *scene, ViewLayer *view_layer, con
bNode *node;
int index = BLI_findindex(&scene->view_layers, view_layer);
- for (node = scene->nodetree->nodes.first; node; node = node->next) {
+ for (node = static_cast<bNode *>(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, view_layer->name, NODE_MAXSTR);
@@ -568,7 +574,7 @@ void BKE_view_layer_rename(Main *bmain, Scene *scene, ViewLayer *view_layer, con
BKE_animdata_fix_paths_rename_all(NULL, "view_layers", oldname, view_layer->name);
/* WM can be missing on startup. */
- wmWindowManager *wm = bmain->wm.first;
+ wmWindowManager *wm = static_cast<wmWindowManager *>(bmain->wm.first);
if (wm) {
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
if (win->scene == scene && STREQ(win->view_layer_name, oldname)) {
@@ -620,7 +626,7 @@ static bool layer_collection_hidden(ViewLayer *view_layer, LayerCollection *lc)
}
/* Restriction flags stay set, so we need to check parents */
- CollectionParent *parent = lc->collection->parents.first;
+ CollectionParent *parent = static_cast<CollectionParent *>(lc->collection->parents.first);
if (parent) {
lc = BKE_layer_collection_first_from_scene_collection(view_layer, parent->collection);
@@ -656,7 +662,7 @@ bool BKE_layer_collection_activate(ViewLayer *view_layer, LayerCollection *lc)
LayerCollection *BKE_layer_collection_activate_parent(ViewLayer *view_layer, LayerCollection *lc)
{
- CollectionParent *parent = lc->collection->parents.first;
+ CollectionParent *parent = static_cast<CollectionParent *>(lc->collection->parents.first);
if (parent) {
lc = BKE_layer_collection_first_from_scene_collection(view_layer, parent->collection);
@@ -672,7 +678,7 @@ LayerCollection *BKE_layer_collection_activate_parent(ViewLayer *view_layer, Lay
}
if (!lc) {
- lc = view_layer->layer_collections.first;
+ lc = static_ca
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list