From aacc4f99e61a0fd510a080e6e453979556bdf9df Mon Sep 17 00:00:00 2001
From: Michael Fabian Dirks <info@xaymar.com>
Date: Thu, 29 Jun 2017 07:35:41 +0200
Subject: [PATCH] filter-displacement: Cleanup data

---
 data/{ => filter-displacement}/disp-stretch-middle.png | 0
 data/{ => filter-displacement}/displacement.effect     | 0
 data/{ => filter-displacement}/neutral.png             | 0
 {data => rawdata}/displace-stretch-middle.png          | 0
 {data => rawdata}/displacement.png                     | 0
 source/filter-displacement.cpp                         | 4 ++--
 source/filter-transform.cpp                            | 2 --
 7 files changed, 2 insertions(+), 4 deletions(-)
 rename data/{ => filter-displacement}/disp-stretch-middle.png (100%)
 rename data/{ => filter-displacement}/displacement.effect (100%)
 rename data/{ => filter-displacement}/neutral.png (100%)
 rename {data => rawdata}/displace-stretch-middle.png (100%)
 rename {data => rawdata}/displacement.png (100%)

diff --git a/data/disp-stretch-middle.png b/data/filter-displacement/disp-stretch-middle.png
similarity index 100%
rename from data/disp-stretch-middle.png
rename to data/filter-displacement/disp-stretch-middle.png
diff --git a/data/displacement.effect b/data/filter-displacement/displacement.effect
similarity index 100%
rename from data/displacement.effect
rename to data/filter-displacement/displacement.effect
diff --git a/data/neutral.png b/data/filter-displacement/neutral.png
similarity index 100%
rename from data/neutral.png
rename to data/filter-displacement/neutral.png
diff --git a/data/displace-stretch-middle.png b/rawdata/displace-stretch-middle.png
similarity index 100%
rename from data/displace-stretch-middle.png
rename to rawdata/displace-stretch-middle.png
diff --git a/data/displacement.png b/rawdata/displacement.png
similarity index 100%
rename from data/displacement.png
rename to rawdata/displacement.png
diff --git a/source/filter-displacement.cpp b/source/filter-displacement.cpp
index b7a35b2..181085d 100644
--- a/source/filter-displacement.cpp
+++ b/source/filter-displacement.cpp
@@ -67,7 +67,7 @@ uint32_t Filter::Displacement::get_height(void *ptr) {
 }
 
 void Filter::Displacement::get_defaults(obs_data_t *data) {
-	char* disp = obs_module_file("displacement.png");
+	char* disp = obs_module_file("filter-displacement/neutral.png");
 	obs_data_set_default_string(data, P_FILTER_DISPLACEMENT_FILE, disp);
 	obs_data_set_default_double(data, P_FILTER_DISPLACEMENT_RATIO, 0);
 	obs_data_set_default_double(data, P_FILTER_DISPLACEMENT_SCALE, 0);
@@ -124,7 +124,7 @@ Filter::Displacement::Instance::Instance(obs_data_t *data, obs_source_t *context
 	this->context = context;
 
 	obs_enter_graphics();
-	char* effectFile = obs_module_file("displacement.effect");
+	char* effectFile = obs_module_file("filter-displacement/displacement.effect");
 	char* errorMessage = nullptr;
 	this->customEffect = gs_effect_create_from_file(effectFile, &errorMessage);
 	bfree(effectFile);
diff --git a/source/filter-transform.cpp b/source/filter-transform.cpp
index ec60aa4..d844441 100644
--- a/source/filter-transform.cpp
+++ b/source/filter-transform.cpp
@@ -424,5 +424,3 @@ void Filter::Transform::Instance::video_render(gs_effect_t *paramEffect) {
 		gs_draw_sprite(shapeTexture, 0, 0, 0);
 	}
 }
-
-