edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix creating nodes for scene material

Browse Source
This commit is contained in:
luboslenco
2020-03-23 17:08:34 +01:00
parent a7fdc07f6e
commit 95981f7e59
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/node/NodesMaterial.hx
+5 -2
View File
@@ -1,6 +1,7 @@
package arm.node;
import zui.Nodes;
import arm.Enums;
class NodesMaterial {
@@ -2167,8 +2168,10 @@ class NodesMaterial {
for (c in list) {
for (n in c) {
if (n.type == nodeType) {
var canvas = Context.material.canvas;
var nodes = Context.material.nodes;
var isScene = arm.ui.UISidebar.inst.worktab.position == SpaceScene;
var material = isScene ? Context.materialScene : Context.material;
var canvas = material.canvas;
var nodes = material.nodes;
var node = arm.ui.UINodes.makeNode(n, nodes, canvas);
canvas.nodes.push(node);
return node;
Sources/arm/ui/UINodes.hx
+1 -1
View File
@@ -455,7 +455,6 @@ class UINodes {
if (drawMenu) {
var list = canvasType == CanvasMaterial ? NodesMaterial.list : NodesBrush.list;
var canvas = canvasType == CanvasMaterial ? Context.material.canvas : Context.brush.canvas;
var numNodes = list[menuCategory].length;
var ph = numNodes * ui.t.ELEMENT_H * ui.SCALE();
@@ -472,6 +471,7 @@ class UINodes {
for (n in list[menuCategory]) {
if (ui.button(" " + n.name, Left)) {
var canvas = getCanvas();
var nodes = getNodes();
var node = makeNode(n, nodes, canvas);
canvas.nodes.push(node);