[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35752] branches/particles-2010: svn merge -r35715:35751 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Thu Mar 24 14:25:30 CET 2011
Revision: 35752
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35752
Author: lukastoenne
Date: 2011-03-24 13:25:29 +0000 (Thu, 24 Mar 2011)
Log Message:
-----------
svn merge -r35715:35751 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35715
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/source/blender/blenkernel/BKE_depsgraph.h
branches/particles-2010/source/blender/blenkernel/intern/blender.c
branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
branches/particles-2010/source/blender/blenkernel/intern/effect.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/blenloader/intern/writefile.c
branches/particles-2010/source/blender/collada/AnimationImporter.cpp
branches/particles-2010/source/blender/collada/CMakeLists.txt
branches/particles-2010/source/blender/collada/DocumentImporter.cpp
branches/particles-2010/source/blender/collada/SConscript
branches/particles-2010/source/blender/editors/animation/fmodifier_ui.c
branches/particles-2010/source/blender/editors/animation/keyframes_draw.c
branches/particles-2010/source/blender/editors/animation/keyingsets.c
branches/particles-2010/source/blender/editors/armature/armature_intern.h
branches/particles-2010/source/blender/editors/armature/armature_ops.c
branches/particles-2010/source/blender/editors/armature/poseSlide.c
branches/particles-2010/source/blender/editors/armature/poseobject.c
branches/particles-2010/source/blender/editors/include/ED_keyframes_draw.h
branches/particles-2010/source/blender/editors/include/UI_interface.h
branches/particles-2010/source/blender/editors/interface/interface.c
branches/particles-2010/source/blender/editors/interface/interface_intern.h
branches/particles-2010/source/blender/editors/interface/interface_layout.c
branches/particles-2010/source/blender/editors/physics/particle_edit.c
branches/particles-2010/source/blender/editors/screen/screen_ops.c
branches/particles-2010/source/blender/editors/space_file/filelist.c
branches/particles-2010/source/blender/editors/space_image/space_image.c
branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
branches/particles-2010/source/blender/editors/transform/transform_input.c
branches/particles-2010/source/blender/makesdna/DNA_scene_types.h
branches/particles-2010/source/blender/makesrna/RNA_access.h
branches/particles-2010/source/blender/makesrna/intern/rna_access.c
branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
branches/particles-2010/source/blender/makesrna/intern/rna_space.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/render/intern/source/occlusion.c
branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/creator.c
Added Paths:
-----------
branches/particles-2010/source/blender/collada/ExtraHandler.cpp
branches/particles-2010/source/blender/collada/ExtraHandler.h
Property Changed:
----------------
branches/particles-2010/
Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:33741-35715
+ /trunk/blender:33741-35751
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2011-03-24 13:15:11 UTC (rev 35751)
+++ branches/particles-2010/CMakeLists.txt 2011-03-24 13:25:29 UTC (rev 35752)
@@ -1022,6 +1022,13 @@
endif()
#-----------------------------------------------------------------------------
+# Configure Python.
+
+if(WITH_PYTHON_MODULE)
+ add_definitions(-DPy_ENABLE_SHARED)
+endif()
+
+#-----------------------------------------------------------------------------
# Extra compile flags
if((NOT WIN32) AND (NOT MSVC))
Modified: branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py 2011-03-24 13:15:11 UTC (rev 35751)
+++ branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py 2011-03-24 13:25:29 UTC (rev 35752)
@@ -17,17 +17,21 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
-# Contributor(s): Campbell Barton
+# Contributor(s): Campbell Barton, M.G. Kishalmi
#
# ***** END GPL LICENSE BLOCK *****
# <pep8 compliant>
"""
-Exampel Win32 usage:
+Example Win32 usage:
c:\Python32\python.exe c:\blender_dev\blender\build_files\cmake\cmake_qtcreator_project.py c:\blender_dev\cmake_build
+
+example linux usage
+ python .~/blenderSVN/blender/build_files/cmake/cmake_qtcreator_project.py ~/blenderSVN/cmake
"""
+import sys
import os
from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
@@ -37,7 +41,21 @@
SIMPLE_PROJECTFILE = False
+# get cmake path
+CMAKE_DIR = sys.argv[-1]
+if not os.path.exists(os.path.join(CMAKE_DIR, "CMakeCache.txt")):
+ CMAKE_DIR = os.getcwd()
+if not os.path.exists(os.path.join(CMAKE_DIR, "CMakeCache.txt")):
+ print("CMakeCache.txt not found in %r or %r\n Pass CMake build dir as an argument, or run from that dir, aborting" % (CMAKE_DIR, os.getcwd()))
+ sys.exit(1)
+
+
+# could be either.
+# PROJECT_DIR = base
+PROJECT_DIR = CMAKE_DIR
+
+
def source_list(path, filename_check=None):
for dirpath, dirnames, filenames in os.walk(path):
@@ -62,6 +80,16 @@
return (ext in (".h", ".hpp", ".hxx"))
+def is_py(filename):
+ ext = splitext(filename)[1]
+ return (ext == ".py")
+
+
+def is_glsl(filename):
+ ext = splitext(filename)[1]
+ return (ext == ".glsl")
+
+
def is_c(filename):
ext = splitext(filename)[1]
return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
@@ -78,19 +106,19 @@
def is_project_file(filename):
- return (is_c_any(filename) or is_cmake(filename)) # and is_svn_file(filename)
+ return (is_c_any(filename) or is_cmake(filename) or is_glsl(filename)) # and is_svn_file(filename)
def cmake_advanced_info():
""" Extracr includes and defines from cmake.
"""
- def create_eclipse_project(cmake_dir):
+ def create_eclipse_project(CMAKE_DIR):
import sys
if sys.platform == "win32":
- cmd = 'cmake %r -G"Eclipse CDT4 - MinGW Makefiles"' % cmake_dir
+ cmd = 'cmake %r -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
else:
- cmd = 'cmake %r -G"Eclipse CDT4 - Unix Makefiles"' % cmake_dir
+ cmd = 'cmake %r -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR
os.system(cmd)
@@ -100,18 +128,10 @@
import os
import sys
- cmake_dir = sys.argv[-1]
+ create_eclipse_project(CMAKE_DIR)
- if not os.path.exists(os.path.join(cmake_dir, "CMakeCache.txt")):
- cmake_dir = os.getcwd()
- if not os.path.exists(os.path.join(cmake_dir, "CMakeCache.txt")):
- print("CMakeCache.txt not found in %r or %r\n Pass CMake build dir as an argument, or run from that dir, abording" % (cmake_dir, os.getcwd()))
- sys.exit(1)
-
- create_eclipse_project(cmake_dir)
-
from xml.dom.minidom import parse
- tree = parse(os.path.join(cmake_dir, ".cproject"))
+ tree = parse(os.path.join(CMAKE_DIR, ".cproject"))
'''
f = open(".cproject_pretty", 'w')
f.write(tree.toprettyxml(indent=" ", newl=""))
@@ -155,26 +175,26 @@
return includes, defines
-def main():
+def create_qtc_project_main():
files = list(source_list(base, filename_check=is_project_file))
- files_rel = [relpath(f, start=base) for f in files]
+ files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
files_rel.sort()
- # --- qtcreator spesific, simple format
+ # --- qtcreator specific, simple format
if SIMPLE_PROJECTFILE:
- # --- qtcreator spesific, simple format
+ # --- qtcreator specific, simple format
PROJECT_NAME = "Blender"
- f = open(join(base, "%s.files" % PROJECT_NAME), 'w')
+ f = open(join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(base, "%s.includes" % PROJECT_NAME), 'w')
+ f = open(join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
f.write("\n".join(sorted(list(set(dirname(f) for f in files_rel if is_c_header(f))))))
- qtc_prj = join(base, "%s.creator" % PROJECT_NAME)
+ qtc_prj = join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(base, "%s.config" % PROJECT_NAME)
+ qtc_cfg = join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
if not exists(qtc_cfg):
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
@@ -186,23 +206,53 @@
includes.sort()
PROJECT_NAME = "Blender"
- f = open(join(base, "%s.files" % PROJECT_NAME), 'w')
+ FILE_NAME = PROJECT_NAME.lower()
+ f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(base, "%s.includes" % PROJECT_NAME), 'w')
+ f = open(join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
f.write("\n".join(sorted(includes)))
- qtc_prj = join(base, "%s.creator" % PROJECT_NAME)
+ qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(base, "%s.config" % PROJECT_NAME)
+ qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
f.write("\n".join([("#define %s %s" % item) for item in defines]))
- print("Project file written to: %s" % qtc_prj)
+ print("Blender project file written to: %s" % qtc_prj)
# --- end
+
+def create_qtc_project_python():
+ files = list(source_list(base, filename_check=is_py))
+ files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel.sort()
+
+ # --- qtcreator specific, simple format
+ PROJECT_NAME = "Blender_Python"
+ FILE_NAME = PROJECT_NAME.lower()
+ f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+ f.write("\n".join(files_rel))
+
+ qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+ f = open(qtc_prj, 'w')
+ f.write("[General]\n")
+
+ qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
+ if not exists(qtc_cfg):
+ f = open(qtc_cfg, 'w')
+ f.write("// ADD PREDEFINED MACROS HERE!\n")
+
+ print("Python project file written to: %s" % qtc_prj)
+
+
+def main():
+ create_qtc_project_main()
+ create_qtc_project_python()
+
+
if __name__ == "__main__":
main()
Modified: branches/particles-2010/build_files/cmake/macros.cmake
===================================================================
--- branches/particles-2010/build_files/cmake/macros.cmake 2011-03-24 13:15:11 UTC (rev 35751)
+++ branches/particles-2010/build_files/cmake/macros.cmake 2011-03-24 13:25:29 UTC (rev 35752)
@@ -66,7 +66,7 @@
link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH})
- if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
+ if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
link_directories(${PYTHON_LIBPATH})
endif()
if(WITH_INTERNATIONAL)
@@ -130,7 +130,7 @@
target_link_libraries(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${LLIBS})
# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
- if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE)
+ if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs
target_link_libraries(${target} ${PYTHON_LINKFLAGS})
if(WIN32 AND NOT UNIX)
Modified: branches/particles-2010/source/blender/blenkernel/BKE_depsgraph.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_depsgraph.h 2011-03-24 13:15:11 UTC (rev 35751)
+++ branches/particles-2010/source/blender/blenkernel/BKE_depsgraph.h 2011-03-24 13:25:29 UTC (rev 35752)
@@ -112,7 +112,7 @@
/* flushes all recalc flags in objects down the dependency tree */
void DAG_scene_flush_update(struct Main *bmain, struct Scene *sce, unsigned int lay, const short do_time);
/* tag objects for update on file load */
-void DAG_on_load_update(struct Main *bmain, const short do_time);
+void DAG_on_visible_update(struct Main *bmain, const short do_time);
/* when setting manual RECALC flags, call this afterwards */
void DAG_ids_flush_update(struct Main *bmain, int time);
Modified: branches/particles-2010/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/blender.c 2011-03-24 13:15:11 UTC (rev 35751)
+++ branches/particles-2010/source/blender/blenkernel/intern/blender.c 2011-03-24 13:25:29 UTC (rev 35752)
@@ -466,7 +466,7 @@
if(success) {
/* important not to update time here, else non keyed tranforms are lost */
- DAG_on_load_update(G.main, FALSE);
+ DAG_on_visible_update(G.main, FALSE);
}
return success;
Modified: branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list