[Igarden-commit] Garden/source/Document MaterialPictSelectDialog.cpp, 1.19, 1.19.2.1
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2006-12-29 21:18:22
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14612 Modified Files: Tag: Release_branch_v1 MaterialPictSelectDialog.cpp Log Message: Add extra note that picture may differ Index: MaterialPictSelectDialog.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.cpp,v retrieving revision 1.19 retrieving revision 1.19.2.1 diff -C2 -d -r1.19 -r1.19.2.1 *** MaterialPictSelectDialog.cpp 13 Jun 2006 02:12:01 -0000 1.19 --- MaterialPictSelectDialog.cpp 29 Dec 2006 21:18:20 -0000 1.19.2.1 *************** *** 93,96 **** --- 93,97 ---- bool hasSupplier = false; const char *by; + pictureLikeness_t likeness; mat = _cell->GetMaterial(); *************** *** 121,125 **** if(mat != NULL && index < mat->GetNumPictureAlternatives()) { ! title = mat->GetIndexedPictureTitle(index, kUsePreferencesSetting, kNameAsHTML); if(!title.empty()) { --- 122,126 ---- if(mat != NULL && index < mat->GetNumPictureAlternatives()) { ! title = mat->GetIndexedPictureTitle(index, kUsePreferencesSetting, kNameAsHTML, likeness); if(!title.empty()) { *************** *** 163,166 **** --- 164,168 ---- bool hasSupplier = false; const char *by; + pictureLikeness_t likeness; mat = _cell->GetMaterial(); *************** *** 185,189 **** if(mat != NULL) { ! title = mat->GetPictureTitle(kUsePreferencesSetting, kNameAsHTML); if(!title.empty()) { --- 187,191 ---- if(mat != NULL) { ! title = mat->GetPictureTitle(kUsePreferencesSetting, kNameAsHTML, likeness); if(!title.empty()) { |