Просмотр исходного кода

Manually copied in two changes from Morgawr's pull request

Ivan Safrin 12 лет назад
Родитель
Сommit
623cb1a643
2 измененных файлов с 6 добавлено и 2 удалено
  1. 2 0
      IDE/Build/Linux/Makefile
  2. 4 2
      IDE/Contents/Source/PolycodeMaterialEditor.cpp

+ 2 - 0
IDE/Build/Linux/Makefile

@@ -9,12 +9,14 @@ default:
 	$(CC) $(CFLAGS) -O2 main.cpp $(SRCS) -o ./Build/Polycode $(LDFLAGS)
 	cp -R ../../Contents/Resources/* Build/
 	cp ../../../Release/Linux/Framework/Core/Assets/default.pak Build/
+	cp ../../../Release/Linux/Framework/Core/Assets/hdr.pak Build/
 	cp -R ../../../Release/Linux/Standalone Build
 debug:
 	mkdir -p ./Build
 	$(CC) $(CFLAGS) -g main.cpp $(SRCS) -o ./Build/Polycode $(LDFLAGS_DEBUG)
 	cp -R ../../Contents/Resources/* Build/
 	cp ../../../Release/Linux/Framework/Core/Assets/default.pak Build/
+	cp ../../../Release/Linux/Framework/Core/Assets/hdr.pak Build/
 	cp -R ../../../Release/Linux/Standalone Build
 
 clean:

+ 4 - 2
IDE/Contents/Source/PolycodeMaterialEditor.cpp

@@ -549,8 +549,10 @@ PostPreviewBox::PostPreviewBox() : UIElement() {
 	previewPrimitive->setMaterialByName("DefaultHDR");
 	previewPrimitive->setColorInt(198, 192, 166, 255);	
 	
-	previewPrimitive->getMaterial()->getShaderBinding(0)->getLocalParamByName("shininess")->setNumber(90);
-
+	if(previewPrimitive->getMaterial()) {
+		previewPrimitive->getMaterial()->getShaderBinding(0)->getLocalParamByName("shininess")->setNumber(90);
+	}
+	
 	previewPrimitive = new ScenePrimitive(ScenePrimitive::TYPE_TORUS, 0.9, 0.45, 26, 16);
 	previewScene->addChild(previewPrimitive);
 	previewPrimitive->setMaterialByName("DefaultHDR");