Changeset 229

Timestamp:

04/24/14 23:58:46 (11 years ago)

Author:

Maciej Komosinski

Message:

Removed false warning "XYZ object expected..." in Matrix functions when a numeric argument is acceptable

Location:

cpp/frams/vm/classes

Files:

• 3dobject.cpp (modified) (1 diff)
• 3dobject.h (modified) (1 diff)

cpp/frams/vm/classes/3dobject.cpp

@@ -191 +191 @@
 }
 
-Pt3D_Ext* Pt3D_Ext::fromObject(const ExtValue& v)
-{
-return (Pt3D_Ext*)v.getObjectTarget(getStaticParam().getName());
+Pt3D_Ext* Pt3D_Ext::fromObject(const ExtValue& v,bool warn)
+{
+return (Pt3D_Ext*)v.getObjectTarget(getStaticParam().getName(), warn);
 }
 

cpp/frams/vm/classes/3dobject.h

@@ -39 +39 @@
 static ExtObject makeDynamicObject(Pt3D_Ext* p);
 static ExtObject makeDynamicObject(const Pt3D& p);
-static Pt3D_Ext* fromObject(const ExtValue& v);
+static Pt3D_Ext* fromObject(const ExtValue& v,bool warn=true);
 static Param& getStaticParam();
 static ParamEntry* getStaticParamtab();