Nightly

Playground/babylon.d.txt

@@ -51717,32 +51717,6 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /**
-<<<<<<< HEAD
-=======
-     * Enum used to define well known values e.g. values automatically provided by the system
-     */
-    export enum NodeMaterialWellKnownValues {
-        /** World */
-        World = 1,
-        /** View */
-        View = 2,
-        /** Projection */
-        Projection = 3,
-        /** ViewProjection */
-        ViewProjection = 4,
-        /** WorldView */
-        WorldView = 5,
-        /** WorldViewProjection */
-        WorldViewProjection = 6,
-        /** CameraPosition */
-        CameraPosition = 7,
-        /** Fog Color */
-        FogColor = 8
-    }
-}
-declare module BABYLON {
-    /**
->>>>>>> e47aa63d1958a485f9b8ebff19354e6c3644dd46
      * Block used to expose an input value
      */
     export class InputBlock extends NodeMaterialBlock {

dist/preview release/babylon.d.ts

@@ -52519,32 +52519,6 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /**
-<<<<<<< HEAD
-=======
-     * Enum used to define well known values e.g. values automatically provided by the system
-     */
-    export enum NodeMaterialWellKnownValues {
-        /** World */
-        World = 1,
-        /** View */
-        View = 2,
-        /** Projection */
-        Projection = 3,
-        /** ViewProjection */
-        ViewProjection = 4,
-        /** WorldView */
-        WorldView = 5,
-        /** WorldViewProjection */
-        WorldViewProjection = 6,
-        /** CameraPosition */
-        CameraPosition = 7,
-        /** Fog Color */
-        FogColor = 8
-    }
-}
-declare module BABYLON {
-    /**
->>>>>>> e47aa63d1958a485f9b8ebff19354e6c3644dd46
      * Block used to expose an input value
      */
     export class InputBlock extends NodeMaterialBlock {

dist/preview release/babylon.module.d.ts

@@ -54963,32 +54963,6 @@ declare module "babylonjs/Materials/Node/NodeMaterialBlockConnectionPointMode" {
         Undefined = 3
     }
 }
-<<<<<<< HEAD
-=======
-declare module "babylonjs/Materials/Node/nodeMaterialWellKnownValues" {
-    /**
-     * Enum used to define well known values e.g. values automatically provided by the system
-     */
-    export enum NodeMaterialWellKnownValues {
-        /** World */
-        World = 1,
-        /** View */
-        View = 2,
-        /** Projection */
-        Projection = 3,
-        /** ViewProjection */
-        ViewProjection = 4,
-        /** WorldView */
-        WorldView = 5,
-        /** WorldViewProjection */
-        WorldViewProjection = 6,
-        /** CameraPosition */
-        CameraPosition = 7,
-        /** Fog Color */
-        FogColor = 8
-    }
-}
->>>>>>> e47aa63d1958a485f9b8ebff19354e6c3644dd46
 declare module "babylonjs/Materials/Node/Blocks/Input/inputBlock" {
     import { NodeMaterialBlock } from "babylonjs/Materials/Node/nodeMaterialBlock";
     import { NodeMaterialBlockConnectionPointTypes } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPointTypes";
@@ -116924,32 +116898,6 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /**
-<<<<<<< HEAD
-=======
-     * Enum used to define well known values e.g. values automatically provided by the system
-     */
-    export enum NodeMaterialWellKnownValues {
-        /** World */
-        World = 1,
-        /** View */
-        View = 2,
-        /** Projection */
-        Projection = 3,
-        /** ViewProjection */
-        ViewProjection = 4,
-        /** WorldView */
-        WorldView = 5,
-        /** WorldViewProjection */
-        WorldViewProjection = 6,
-        /** CameraPosition */
-        CameraPosition = 7,
-        /** Fog Color */
-        FogColor = 8
-    }
-}
-declare module BABYLON {
-    /**
->>>>>>> e47aa63d1958a485f9b8ebff19354e6c3644dd46
      * Block used to expose an input value
      */
     export class InputBlock extends NodeMaterialBlock {

dist/preview release/documentation.d.ts

@@ -52519,32 +52519,6 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /**
-<<<<<<< HEAD
-=======
-     * Enum used to define well known values e.g. values automatically provided by the system
-     */
-    export enum NodeMaterialWellKnownValues {
-        /** World */
-        World = 1,
-        /** View */
-        View = 2,
-        /** Projection */
-        Projection = 3,
-        /** ViewProjection */
-        ViewProjection = 4,
-        /** WorldView */
-        WorldView = 5,
-        /** WorldViewProjection */
-        WorldViewProjection = 6,
-        /** CameraPosition */
-        CameraPosition = 7,
-        /** Fog Color */
-        FogColor = 8
-    }
-}
-declare module BABYLON {
-    /**
->>>>>>> e47aa63d1958a485f9b8ebff19354e6c3644dd46
      * Block used to expose an input value
      */
     export class InputBlock extends NodeMaterialBlock {

dist/preview release/gui/babylon.gui.js

@@ -11606,7 +11606,7 @@ var TextBlock = /** @class */ (function (_super) {
                 }
                 var lines = this._lines ? this._lines : this._breakLines(this.widthInPixels - this.paddingLeftInPixels - this.paddingRightInPixels, context_1);
                 var newHeight = this.paddingTopInPixels + this.paddingBottomInPixels + this._fontOffset.height * lines.length;
-                if (this._lines.length > 0 && this._lineSpacing.internalValue !== 0) {
+                if (lines.length > 0 && this._lineSpacing.internalValue !== 0) {
                     var lineSpacing = 0;
                     if (this._lineSpacing.isPixel) {
                         lineSpacing = this._lineSpacing.getValue(this._host);

dist/preview release/viewer/babylon.module.d.ts

@@ -54963,32 +54963,6 @@ declare module "babylonjs/Materials/Node/NodeMaterialBlockConnectionPointMode" {
         Undefined = 3
     }
 }
-<<<<<<< HEAD
-=======
-declare module "babylonjs/Materials/Node/nodeMaterialWellKnownValues" {
-    /**
-     * Enum used to define well known values e.g. values automatically provided by the system
-     */
-    export enum NodeMaterialWellKnownValues {
-        /** World */
-        World = 1,
-        /** View */
-        View = 2,
-        /** Projection */
-        Projection = 3,
-        /** ViewProjection */
-        ViewProjection = 4,
-        /** WorldView */
-        WorldView = 5,
-        /** WorldViewProjection */
-        WorldViewProjection = 6,
-        /** CameraPosition */
-        CameraPosition = 7,
-        /** Fog Color */
-        FogColor = 8
-    }
-}
->>>>>>> e47aa63d1958a485f9b8ebff19354e6c3644dd46
 declare module "babylonjs/Materials/Node/Blocks/Input/inputBlock" {
     import { NodeMaterialBlock } from "babylonjs/Materials/Node/nodeMaterialBlock";
     import { NodeMaterialBlockConnectionPointTypes } from "babylonjs/Materials/Node/nodeMaterialBlockConnectionPointTypes";
@@ -116924,32 +116898,6 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /**
-<<<<<<< HEAD
-=======
-     * Enum used to define well known values e.g. values automatically provided by the system
-     */
-    export enum NodeMaterialWellKnownValues {
-        /** World */
-        World = 1,
-        /** View */
-        View = 2,
-        /** Projection */
-        Projection = 3,
-        /** ViewProjection */
-        ViewProjection = 4,
-        /** WorldView */
-        WorldView = 5,
-        /** WorldViewProjection */
-        WorldViewProjection = 6,
-        /** CameraPosition */
-        CameraPosition = 7,
-        /** Fog Color */
-        FogColor = 8
-    }
-}
-declare module BABYLON {
-    /**
->>>>>>> e47aa63d1958a485f9b8ebff19354e6c3644dd46
      * Block used to expose an input value
      */
     export class InputBlock extends NodeMaterialBlock {