/[Sims3RigEditor]/trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h
ViewVC logotype

Diff of /trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h	2010/08/14 20:21:40	84
+++ trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h	2010/08/15 00:51:50	88
@@ -107,8 +107,7 @@
 
 		this->GR2LibPropertyWrapper = gcnew GR2LibWrapper();
 		ConvertToManaged();
-		propgrid->SelectedObject = this->GR2LibPropertyWrapper;
-		this->GR2LibPropertyWrapper->HideNonSelectableObjects(this->propgrid);
+		propgrid->SelectedObject = this->GR2LibPropertyWrapper->GetPropertiesValidForThisInstance();
 	}
 
 protected:
@@ -423,6 +422,9 @@
 					::coreapi::EnumToStringSupport::GetGrannyEnumTypeString<gr2lib::core::typedefs::granny_pixel_layout>(
 					(gr2lib::core::typedefs::granny_pixel_layout)toolinfo[i]->SubFormat),
 					(gr2lib::core::typedefs::granny_pixel_layout)toolinfo[i]->SubFormat);
+
+				//t->Layout = gr2lib::core::typedefs::granny_pixel_layouts::GetPixelLayoutFromEnum(t->SubFormat->Value);
+
 				t->Layout = gcnew gr2lib::core::coretypes::implementation::Layout();
 				t->Layout->BytesPerPixel = toolinfo[i]->Layout.BytesPerPixel;
 				for(int j=0;j<granny_pixel_layout_bitshift_size;j++)
@@ -682,7 +684,6 @@
 				_grn_file->GrannyFileInfo->Textures[i]->ExtendedData = ExtendedData_ToNative(GR2LibPropertyWrapper->Textures[i]->ExtendedData,_grn_file->GrannyFileInfo->Textures[i]->ExtendedData);
 			}
 		}
-
 	}
 #pragma endregion
 #pragma region Materials_ToNative
@@ -869,8 +870,7 @@
 
 			 this->GR2LibPropertyWrapper = gcnew GR2LibWrapper();
 			 ConvertToManaged();
-			 propgrid->SelectedObject = this->GR2LibPropertyWrapper;
-			 this->GR2LibPropertyWrapper->HideNonSelectableObjects(this->propgrid);
+			 propgrid->SelectedObject = this->GR2LibPropertyWrapper->GetPropertiesValidForThisInstance();
 		 }
 private: System::Void gr2lib_rigeditor_frm_FormClosed(System::Object^  sender, System::Windows::Forms::FormClosedEventArgs^  e) 
 		 {

 

  ViewVC Help
Powered by ViewVC 1.1.22