[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14800] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: merged changes to revision 14798, compilation works for rendering/ directry.

Maxime Curioni maxime.curioni at gmail.com
Sun May 11 22:28:47 CEST 2008 

Revision: 14800
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14800
Author:   mxcurioni
Date:     2008-05-11 22:28:47 +0200 (Sun, 11 May 2008)

Log Message:
-----------
soc-2008-mxcurioni: merged changes to revision 14798, compilation works for rendering/ directry. Still needs to figure out how to compile on non-Unix machines.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14798

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2008-mxcurioni/release/scripts/3ds_export.py
    branches/soc-2008-mxcurioni/release/scripts/bevel_center.py
    branches/soc-2008-mxcurioni/release/scripts/blenderLipSynchro.py
    branches/soc-2008-mxcurioni/release/scripts/export_m3g.py
    branches/soc-2008-mxcurioni/release/scripts/hotkeys.py
    branches/soc-2008-mxcurioni/release/scripts/import_dxf.py
    branches/soc-2008-mxcurioni/release/scripts/paths_import.py
    branches/soc-2008-mxcurioni/release/scripts/rvk1_torvk2.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLRenderer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLUtils.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/pbuffer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/pbuffer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/StringUtils.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Blender.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Object.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Particle.c
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Particle.h
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/API_intro.py
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Object.py
    branches/soc-2008-mxcurioni/source/blender/src/buttons_object.c
    branches/soc-2008-mxcurioni/source/blender/src/buttons_shading.c
    branches/soc-2008-mxcurioni/source/blender/src/drawseq.c
    branches/soc-2008-mxcurioni/source/blender/src/drawview.c
    branches/soc-2008-mxcurioni/source/blender/src/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/src/editdeform.c
    branches/soc-2008-mxcurioni/source/blender/src/editface.c
    branches/soc-2008-mxcurioni/source/blender/src/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/src/header_view3d.c
    branches/soc-2008-mxcurioni/source/blender/src/space.c
    branches/soc-2008-mxcurioni/source/blender/src/toets.c
    branches/soc-2008-mxcurioni/source/blender/src/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/src/transform_generics.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameLogic.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Particle.py

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.h

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.cpp	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.cpp	2008-05-11 20:28:47 UTC (rev 14800)
@@ -73,7 +73,9 @@
     if (ndofLibraryInit  && ndofDeviceOpen)
     {
     	Pid= ndofLibraryInit();
+#if 0
        	printf("%i client \n", Pid);
+#endif
 		#if defined(_WIN32) || defined(__APPLE__)
 			m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
 		#else

Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp	2008-05-11 20:28:47 UTC (rev 14800)
@@ -283,9 +283,11 @@
 	m_eventManager = new GHOST_EventManager ();
     m_ndofManager = new GHOST_NDOFManager();
 
+#if 0
 	if(m_ndofManager)
 		printf("ndof manager \n");
-
+#endif
+	
 #ifdef GHOST_DEBUG
 	if (m_eventManager) {
 		m_eventManager->addConsumer(&m_eventPrinter);

Modified: branches/soc-2008-mxcurioni/release/scripts/3ds_export.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/3ds_export.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/3ds_export.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,5 +1,5 @@
 #!BPY
-
+# coding: utf-8
 """ 
 Name: '3D Studio (.3ds)...'
 Blender: 243

Modified: branches/soc-2008-mxcurioni/release/scripts/bevel_center.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/bevel_center.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/bevel_center.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,5 +1,5 @@
 #!BPY
-
+# coding: utf-8
 """ Registration info for Blender menus
 Name: 'Bevel Center'
 Blender: 243

Modified: branches/soc-2008-mxcurioni/release/scripts/blenderLipSynchro.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/blenderLipSynchro.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/blenderLipSynchro.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,5 +1,5 @@
 #!BPY
-
+# coding: utf-8
 """
 Name: 'BlenderLipSynchro'
 Blender: 242

Modified: branches/soc-2008-mxcurioni/release/scripts/export_m3g.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/export_m3g.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/export_m3g.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,4 +1,5 @@
 #!BPY
+# coding: utf-8
 """ Registration info for Blender menus:
 Name: 'M3G (.m3g, .java)...'
 Blender: 244
@@ -3069,4 +3070,5 @@
     Window.RedrawAll()
     
 if __name__ == '__main__':
-    gui()
\ No newline at end of file
+    gui()
+

Modified: branches/soc-2008-mxcurioni/release/scripts/hotkeys.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/hotkeys.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/hotkeys.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,5 +1,5 @@
 #!BPY
-
+# coding: utf-8
 """ Registration info for Blender menus:
 Name: 'HotKey and MouseAction Reference'
 Blender: 242
@@ -918,4 +918,4 @@
           Blender.Window.Redraw()
 
 if __name__ == '__main__':
-	Register(draw, event, bevent)
\ No newline at end of file
+	Register(draw, event, bevent)

Modified: branches/soc-2008-mxcurioni/release/scripts/import_dxf.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/import_dxf.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/import_dxf.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,5 +1,5 @@
 #!BPY
-
+# coding: utf-8
 """
 Name: 'Autodesk DXF (.dxf)'
 Blender: 244
@@ -5942,4 +5942,5 @@
 			main(_dxf)
 
 	print 'TOTAL TIME: %.6f' % (Blender.sys.time() - TIME)
-"""
\ No newline at end of file
+"""
+

Modified: branches/soc-2008-mxcurioni/release/scripts/paths_import.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/paths_import.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/paths_import.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,5 +1,5 @@
 #!BPY
-
+# coding: utf-8
 """
 Name: 'Paths (.svg, .ps, .eps, .ai, Gimp)'
 Blender: 233
@@ -92,4 +92,5 @@
   fonctionSELECT = functionSELECT # can they all be called function?
 
 text = 'Import %s' % argv
-Blender.Window.FileSelector (fonctionSELECT, text)
\ No newline at end of file
+Blender.Window.FileSelector (fonctionSELECT, text)
+

Modified: branches/soc-2008-mxcurioni/release/scripts/rvk1_torvk2.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/rvk1_torvk2.py	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/release/scripts/rvk1_torvk2.py	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1,5 +1,5 @@
 #!BPY
-
+# coding: utf-8
 """ Registration info for Blender menus: <- these words are ignored
 Name: 'Deformed mesh to Rvk'
 Blender: 243
@@ -270,4 +270,4 @@
 EDITMODE=Blender.Window.EditMode()
 Blender.Window.EditMode(0)
 deform2rvk()
-Blender.Window.EditMode(EDITMODE)
\ No newline at end of file
+Blender.Window.EditMode(EDITMODE)

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c	2008-05-11 20:28:47 UTC (rev 14800)
@@ -1054,7 +1054,11 @@
 	psysn->childcache= NULL;
 	psysn->edit= NULL;
 	psysn->effectors.first= psysn->effectors.last= 0;
-
+	
+	psysn->pathcachebufs.first = psysn->pathcachebufs.last = NULL;
+	psysn->reactevents.first = psysn->reactevents.last = NULL;
+	psysn->renderdata = NULL;
+	
 	psysn->pointcache= BKE_ptcache_copy(psys->pointcache);
 
 	id_us_plus((ID *)psysn->part);

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-05-11 20:28:47 UTC (rev 14800)
@@ -45,6 +45,12 @@
 stroke_sources = env.Glob(prefix + '/*.cpp')
 
 #	rendering
+prefix = 'intern/rendering'
+stroke_sources = env.Glob(prefix + '/GL*.cpp')
+
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
+	stroke_sources = env.Glob(prefix + '/extgl.cpp')
+
 # 	app
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources + \

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLRenderer.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLRenderer.cpp	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLRenderer.cpp	2008-05-11 20:28:47 UTC (rev 14800)
@@ -281,7 +281,7 @@
   }
 
  const vector<Vec3r>& vertices = iLine.vertices();
-  float step=1.f/vertices.size();
+  //soc unused float step=1.f/vertices.size();
   vector<Vec3r>::const_iterator v;
 
   for(v=vertices.begin(); v!=vertices.end(); v++)

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp	2008-05-11 19:58:46 UTC (rev 14799)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp	2008-05-11 20:28:47 UTC (rev 14800)
@@ -19,12 +19,18 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include <qimage.h>
-#include <qfileinfo.h>
-#include <qgl.h>
-#include <qfile.h>
 #include "GLStrokeRenderer.h"
 
+//soc
+// #include <qimage.h>
+// #include <qfileinfo.h>
+// #include <qgl.h>
+// #include <qfile.h>
+#include "BLI_blenlib.h"
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
+#include "../system/StringUtils.h"
+
 #ifdef WIN32
 # include "extgl.h"
 #endif // WIN32
@@ -77,7 +83,7 @@
       // renderNoTexture(iStrokeRep);
       // return;
     // }
-  int i;
+  //soc unused - int i;
   glDisable(GL_CULL_FACE);
   glDisable(GL_LIGHTING);
   glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
@@ -150,8 +156,8 @@
 void GLStrokeRenderer::RenderStrokeRepBasic(StrokeRep *iStrokeRep) const
 {
   glPushAttrib(GL_COLOR_BUFFER_BIT);
-  Stroke::MediumType strokeType = iStrokeRep->getMediumType();
-  int i;
+  //soc unused - Stroke::MediumType strokeType = iStrokeRep->getMediumType();
+  //soc unused - int i;
   glDisable(GL_CULL_FACE);
   glDisable(GL_LIGHTING);
   glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
@@ -273,7 +279,7 @@
   _papertexname = new unsigned[size];
   GLuint *tmp = new GLuint[size];
   glGenTextures(size, tmp);
-  for(int i=0;i<size;++i){
+  for(unsigned i=0;i<size;++i){
     _papertexname[i] = tmp[i];
   }
   delete [] tmp;
@@ -308,13 +314,14 @@
   glGenTextures(1, &texId);
   bool found = false;
   vector<string> pathnames;
-  QString path;
+  string path; //soc
   StringUtils::getPathName(TextureManager::Options::getBrushesPath(),
   sname,
   pathnames);
   for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) {
     path = j->c_str();
-    if(QFile::exists(path)){
+    //soc if(QFile::exists(path)){
+	if( BLI_exists( const_cast<char *>(path.c_str()) ) ) {
       found = true;
       break;
     }
@@ -325,12 +332,14 @@
   cout << "Loading brush texture..." << endl;
   switch(mediumType){
   case Stroke::DRY_MEDIUM:
-    prepareTextureLuminance((const char*)path.toAscii(), texId);
+    //soc prepareTextureLuminance((const char*)path.toAscii(), texId);

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list