Browse Source

maxegg: fix compilation error due to nullptr misuse

rdb 7 years ago
parent
commit
f990f816b8
2 changed files with 2 additions and 2 deletions
  1. 1 1
      pandatool/src/maxegg/maxEgg.cxx
  2. 1 1
      pandatool/src/maxegg/maxOptionsDialog.cxx

+ 1 - 1
pandatool/src/maxegg/maxEgg.cxx

@@ -456,7 +456,7 @@ void MaxEggPlugin::EndEditParams( IObjParam *ip, ULONG flags,Animatable *prev)
         ip->DeleteRollupPage(hMaxEggParams);
         ip->DeleteRollupPage(hMaxEggParams);
         hMaxEggParams = nullptr;
         hMaxEggParams = nullptr;
     } else {
     } else {
-        SetWindowLongPtr( hMaxEggParams, GWLP_USERDATA, nullptr );
+        SetWindowLongPtr( hMaxEggParams, GWLP_USERDATA, 0L );
     }
     }
 }
 }
 
 

+ 1 - 1
pandatool/src/maxegg/maxOptionsDialog.cxx

@@ -593,7 +593,7 @@ bool MaxOptionsDialog::UpdateFromUI(HWND hWnd) {
     _stprintf(_short_name, _T("%.*s..."), sizeof(_short_name)-4, temp);
     _stprintf(_short_name, _T("%.*s..."), sizeof(_short_name)-4, temp);
   else {
   else {
     _tcscpy(_short_name, temp);
     _tcscpy(_short_name, temp);
-    _short_name[_tcslen(_short_name) - 4] = nullptr; //Cut off the .egg
+    _short_name[_tcslen(_short_name) - 4] = 0; //Cut off the .egg
   }
   }
 
 
   _start_frame = newSF;
   _start_frame = newSF;