paint: cleanup
This commit is contained in:
@@ -235,8 +235,8 @@ static void bake_texture_node_button(i32 node_id) {
|
||||
|
||||
if (bake_type == BAKE_TYPE_NORMAL || bake_type == BAKE_TYPE_HEIGHT || bake_type == BAKE_TYPE_DERIVATIVE) {
|
||||
string_array_t *ar = any_array_create_from_raw((void *[]){}, 0);
|
||||
for (i32 i = 0; i < project_paint_objects->length; ++i) {
|
||||
mesh_object_t *p = project_paint_objects->buffer[i];
|
||||
for (i32 i = 0; i < g_project->_->paint_objects->length; ++i) {
|
||||
mesh_object_t *p = g_project->_->paint_objects->buffer[i];
|
||||
any_array_push(ar, p->base->name);
|
||||
}
|
||||
ui_handle_t *poly_handle = ui_nest(h, 11);
|
||||
|
||||
@@ -19,8 +19,8 @@ void nodes_material_new_group_button(i32 node_id) {
|
||||
for (i32 i = 1; i < 999; ++i) {
|
||||
node->name = string("%s %s", tr("Group"), i32_to_string(i));
|
||||
bool found = false;
|
||||
for (i32 i = 0; i < project_material_groups->length; ++i) {
|
||||
node_group_t *g = project_material_groups->buffer[i];
|
||||
for (i32 i = 0; i < g_project->_->material_groups->length; ++i) {
|
||||
node_group_t *g = g_project->_->material_groups->buffer[i];
|
||||
char *cname = g->canvas->name;
|
||||
if (string_equals(cname, node->name)) {
|
||||
found = true;
|
||||
@@ -78,11 +78,11 @@ void nodes_material_new_group_button(i32 node_id) {
|
||||
2),
|
||||
.links = any_array_create_from_raw((void *[]){}, 0)});
|
||||
node_group_t *ng = GC_ALLOC_INIT(node_group_t, {.canvas = canvas, .nodes = ui_nodes_create()});
|
||||
any_array_push(project_material_groups, ng);
|
||||
any_array_push(g_project->_->material_groups, ng);
|
||||
}
|
||||
node_group_t *group = NULL;
|
||||
for (i32 i = 0; i < project_material_groups->length; ++i) {
|
||||
node_group_t *g = project_material_groups->buffer[i];
|
||||
for (i32 i = 0; i < g_project->_->material_groups->length; ++i) {
|
||||
node_group_t *g = g_project->_->material_groups->buffer[i];
|
||||
char *cname = g->canvas->name;
|
||||
if (string_equals(cname, node->name)) {
|
||||
group = g;
|
||||
@@ -171,12 +171,12 @@ void nodes_material_sync_group_sockets(ui_node_canvas_t *canvas, char *group_nam
|
||||
void nodes_material_sync_sockets(ui_node_t *node) {
|
||||
node_group_t_array_t *group_stack = ui_nodes_group_stack;
|
||||
ui_node_canvas_t *c = group_stack->buffer[group_stack->length - 1]->canvas;
|
||||
for (i32 i = 0; i < project_materials->length; ++i) {
|
||||
slot_material_t *m = project_materials->buffer[i];
|
||||
for (i32 i = 0; i < g_project->_->materials->length; ++i) {
|
||||
slot_material_t *m = g_project->_->materials->buffer[i];
|
||||
nodes_material_sync_group_sockets(m->canvas, c->name, node);
|
||||
}
|
||||
for (i32 i = 0; i < project_material_groups->length; ++i) {
|
||||
node_group_t *g = project_material_groups->buffer[i];
|
||||
for (i32 i = 0; i < g_project->_->material_groups->length; ++i) {
|
||||
node_group_t *g = g_project->_->material_groups->buffer[i];
|
||||
nodes_material_sync_group_sockets(g->canvas, c->name, node);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
char *material_node_vector(ui_node_t *node, ui_node_socket_t *socket) {
|
||||
char *result = "float3(0.0, 0.0, 0.0)";
|
||||
i32 mi = node->buttons->buffer[0]->default_value->buffer[0];
|
||||
if (mi >= project_materials->length) {
|
||||
if (mi >= g_project->_->materials->length) {
|
||||
return result;
|
||||
}
|
||||
slot_material_t *m = project_materials->buffer[mi];
|
||||
slot_material_t *m = g_project->_->materials->buffer[mi];
|
||||
ui_node_t_array_t *_nodes = parser_material_nodes;
|
||||
ui_node_link_t_array_t *_links = parser_material_links;
|
||||
gc_unroot(parser_material_nodes);
|
||||
@@ -37,9 +37,9 @@ char *material_node_vector(ui_node_t *node, ui_node_socket_t *socket) {
|
||||
char *material_node_value(ui_node_t *node, ui_node_socket_t *socket) {
|
||||
char *result = "0.0";
|
||||
i32 mi = node->buttons->buffer[0]->default_value->buffer[0];
|
||||
if (mi >= project_materials->length)
|
||||
if (mi >= g_project->_->materials->length)
|
||||
return result;
|
||||
slot_material_t *m = project_materials->buffer[mi];
|
||||
slot_material_t *m = g_project->_->materials->buffer[mi];
|
||||
ui_node_t_array_t *_nodes = parser_material_nodes;
|
||||
ui_node_link_t_array_t *_links = parser_material_links;
|
||||
gc_unroot(parser_material_nodes);
|
||||
|
||||
Reference in New Issue
Block a user