[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57114] tags/blender-2.67b-release/blender : svn merge ^/trunk/blender -c56930 -c56935 -c56943 -c56956

Campbell Barton ideasman42 at gmail.com
Wed May 29 17:48:15 CEST 2013


Revision: 57114
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57114
Author:   campbellbarton
Date:     2013-05-29 15:48:15 +0000 (Wed, 29 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56930 -c56935 -c56943 -c56956

Modified Paths:
--------------
    tags/blender-2.67b-release/blender/intern/smoke/extern/smoke_API.h
    tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.cpp
    tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.h
    tags/blender-2.67b-release/blender/intern/smoke/intern/smoke_API.cpp
    tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/smoke.c
    tags/blender-2.67b-release/blender/source/blender/editors/transform/transform_ops.c
    tags/blender-2.67b-release/blender/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
    tags/blender-2.67b-release/blender/source/creator/creator.c

Property Changed:
----------------
    tags/blender-2.67b-release/blender/


Property changes on: tags/blender-2.67b-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56867-56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56823,56826,56828,56830,56833-56834,56836,56839,56851,56857,56863,56865,56867-56868,56871-56873,56879-56882,56885,56890,56892,56894,56896-56898,56901-56902,56905-56908,56912,56930,56935,56943,56956

Modified: tags/blender-2.67b-release/blender/intern/smoke/extern/smoke_API.h
===================================================================
--- tags/blender-2.67b-release/blender/intern/smoke/extern/smoke_API.h	2013-05-29 15:38:51 UTC (rev 57113)
+++ tags/blender-2.67b-release/blender/intern/smoke/extern/smoke_API.h	2013-05-29 15:48:15 UTC (rev 57114)
@@ -74,7 +74,7 @@
 void smoke_dissolve(struct FLUID_3D *fluid, int speed, int log);
 
 // wavelet turbulence functions
-struct WTURBULENCE *smoke_turbulence_init(int *res, int amplify, int noisetype, int use_fire, int use_colors);
+struct WTURBULENCE *smoke_turbulence_init(int *res, int amplify, int noisetype, const char *noisefile_path, int use_fire, int use_colors);
 void smoke_turbulence_free(struct WTURBULENCE *wt);
 void smoke_turbulence_step(struct WTURBULENCE *wt, struct FLUID_3D *fluid);
 
@@ -89,7 +89,7 @@
 float *smoke_turbulence_get_react(struct WTURBULENCE *wt);
 void smoke_turbulence_get_res(struct WTURBULENCE *wt, int *res);
 int smoke_turbulence_get_cells(struct WTURBULENCE *wt);
-void smoke_turbulence_set_noise(struct WTURBULENCE *wt, int type);
+void smoke_turbulence_set_noise(struct WTURBULENCE *wt, int type, const char *noisefile_path);
 void smoke_initWaveletBlenderRNA(struct WTURBULENCE *wt, float *strength);
 void smoke_dissolve_wavelet(struct WTURBULENCE *wt, int speed, int log);
 

Modified: tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.cpp
===================================================================
--- tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.cpp	2013-05-29 15:38:51 UTC (rev 57113)
+++ tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.cpp	2013-05-29 15:48:15 UTC (rev 57114)
@@ -51,7 +51,7 @@
 //////////////////////////////////////////////////////////////////////
 // constructor
 //////////////////////////////////////////////////////////////////////
-WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int noisetype, int init_fire, int init_colors)
+WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int noisetype, const char *noisefile_path, int init_fire, int init_colors)
 {
 	// if noise magnitude is below this threshold, its contribution
 	// is negilgible, so stop evaluating new octaves
@@ -131,15 +131,7 @@
 	
 	// noise tiles
 	_noiseTile = new float[noiseTileSize * noiseTileSize * noiseTileSize];
-	/*
-	std::string noiseTileFilename = std::string("noise.wavelets");
-	generateTile_WAVELET(_noiseTile, noiseTileFilename);
-	*/
-	setNoise(noisetype);
-	/*
-	std::string noiseTileFilename = std::string("noise.fft");
-	generatTile_FFT(_noiseTile, noiseTileFilename);
-	*/
+	setNoise(noisetype, noisefile_path);
 }
 
 void WTURBULENCE::initFire()
@@ -216,13 +208,13 @@
 // type (1<<1) = FFT / 4
 // type (1<<2) = curl / 8
 //////////////////////////////////////////////////////////////////////
-void WTURBULENCE::setNoise(int type)
+void WTURBULENCE::setNoise(int type, const char *noisefile_path)
 {
 	if(type == (1<<1)) // FFT
 	{
 #ifdef WITH_FFTW3
 		// needs fft
-		std::string noiseTileFilename = std::string("noise.fft");
+		std::string noiseTileFilename = std::string(noisefile_path) + std::string("noise.fft");
 		generatTile_FFT(_noiseTile, noiseTileFilename);
 		return;
 #else
@@ -237,7 +229,7 @@
 	}
 #endif
 
-	std::string noiseTileFilename = std::string("noise.wavelets");
+	std::string noiseTileFilename = std::string(noisefile_path) + std::string("noise.wavelets");
 	generateTile_WAVELET(_noiseTile, noiseTileFilename);
 }
 

Modified: tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.h
===================================================================
--- tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.h	2013-05-29 15:38:51 UTC (rev 57113)
+++ tags/blender-2.67b-release/blender/intern/smoke/intern/WTURBULENCE.h	2013-05-29 15:48:15 UTC (rev 57114)
@@ -36,7 +36,7 @@
 {
 	public:
 		// both config files can be NULL, altCfg might override values from noiseCfg
-		WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int noisetype, int init_fire, int init_colors);
+		WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int noisetype, const char *noisefile_path, int init_fire, int init_colors);
 
 		/// destructor
 		virtual ~WTURBULENCE();
@@ -44,7 +44,7 @@
 		void initFire();
 		void initColors(float init_r, float init_g, float init_b);
 		
-		void setNoise(int type);
+		void setNoise(int type, const char *noisefile_path);
 		void initBlenderRNA(float *strength);
 
 		// step more readable version -- no rotation correction

Modified: tags/blender-2.67b-release/blender/intern/smoke/intern/smoke_API.cpp
===================================================================
--- tags/blender-2.67b-release/blender/intern/smoke/intern/smoke_API.cpp	2013-05-29 15:38:51 UTC (rev 57113)
+++ tags/blender-2.67b-release/blender/intern/smoke/intern/smoke_API.cpp	2013-05-29 15:48:15 UTC (rev 57114)
@@ -44,10 +44,10 @@
 	return fluid;
 }
 
-extern "C" WTURBULENCE *smoke_turbulence_init(int *res, int amplify, int noisetype, int use_fire, int use_colors)
+extern "C" WTURBULENCE *smoke_turbulence_init(int *res, int amplify, int noisetype, const char *noisefile_path, int use_fire, int use_colors)
 {
 	if (amplify)
-		return new WTURBULENCE(res[0],res[1],res[2], amplify, noisetype, use_fire, use_colors);
+		return new WTURBULENCE(res[0],res[1],res[2], amplify, noisetype, noisefile_path, use_fire, use_colors);
 	else 
 		return NULL;
 }
@@ -436,9 +436,9 @@
 }
 #endif
 
-extern "C" void smoke_turbulence_set_noise(WTURBULENCE *wt, int type)
+extern "C" void smoke_turbulence_set_noise(WTURBULENCE *wt, int type, const char *noisefile_path)
 {
-	wt->setNoise(type);
+	wt->setNoise(type, noisefile_path);
 }
 
 extern "C" void flame_get_spectrum(unsigned char *spec, int width, float t1, float t2)

Modified: tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/smoke.c	2013-05-29 15:38:51 UTC (rev 57113)
+++ tags/blender-2.67b-release/blender/source/blender/blenkernel/intern/smoke.c	2013-05-29 15:48:15 UTC (rev 57114)
@@ -146,7 +146,7 @@
 #else /* WITH_SMOKE */
 
 /* Stubs to use when smoke is disabled */
-struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype), int UNUSED(use_fire), int UNUSED(use_colors)) { return NULL; }
+struct WTURBULENCE *smoke_turbulence_init(int *UNUSED(res), int UNUSED(amplify), int UNUSED(noisetype), const char *UNUSED(noisefile_path), int UNUSED(use_fire), int UNUSED(use_colors)) { return NULL; }
 //struct FLUID_3D *smoke_init(int *UNUSED(res), float *UNUSED(dx), float *UNUSED(dtdef), int UNUSED(use_heat), int UNUSED(use_fire), int UNUSED(use_colors)) { return NULL; }
 void smoke_free(struct FLUID_3D *UNUSED(fluid)) {}
 float *smoke_get_density(struct FLUID_3D *UNUSED(fluid)) { return NULL; }
@@ -196,7 +196,7 @@
 		sds->wt = NULL;
 		return;
 	}
-	sds->wt = smoke_turbulence_init(res, sds->amplify + 1, sds->noise, use_fire, use_colors);
+	sds->wt = smoke_turbulence_init(res, sds->amplify + 1, sds->noise, BLI_temporary_dir(), use_fire, use_colors);
 	sds->res_wt[0] = res[0] * (sds->amplify + 1);
 	sds->res_wt[1] = res[1] * (sds->amplify + 1);
 	sds->res_wt[2] = res[2] * (sds->amplify + 1);

Modified: tags/blender-2.67b-release/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- tags/blender-2.67b-release/blender/source/blender/editors/transform/transform_ops.c	2013-05-29 15:38:51 UTC (rev 57113)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list