[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36726] branches/bmesh/blender: svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Campbell Barton ideasman42 at gmail.com
Tue May 17 09:03:13 CEST 2011


Revision: 36726
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36726
Author:   campbellbarton
Date:     2011-05-17 07:03:12 +0000 (Tue, 17 May 2011)
Log Message:
-----------
svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36672

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
    branches/bmesh/blender/build_files/cmake/macros.cmake
    branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
    branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
    branches/bmesh/blender/build_files/scons/tools/Blender.py
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/bmesh/blender/release/scripts/templates/operator_export.py
    branches/bmesh/blender/release/scripts/templates/operator_mesh_add.py
    branches/bmesh/blender/source/blender/blenkernel/BKE_colortools.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
    branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenkernel/SConscript
    branches/bmesh/blender/source/blender/blenkernel/intern/colortools.c
    branches/bmesh/blender/source/blender/blenkernel/intern/icons.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
    branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/editors/animation/keyframing.c
    branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
    branches/bmesh/blender/source/blender/editors/interface/interface_icons.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/object/object_edit.c
    branches/bmesh/blender/source/blender/editors/object/object_modifier.c
    branches/bmesh/blender/source/blender/editors/physics/physics_ops.c
    branches/bmesh/blender/source/blender/editors/physics/physics_pointcache.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/bmesh/blender/source/blender/editors/space_action/action_select.c
    branches/bmesh/blender/source/blender/editors/space_file/filelist.c
    branches/bmesh/blender/source/blender/editors/space_image/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/space_image/SConscript
    branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/bmesh/blender/source/blender/imbuf/CMakeLists.txt
    branches/bmesh/blender/source/blender/imbuf/IMB_imbuf_types.h
    branches/bmesh/blender/source/blender/imbuf/SConscript
    branches/bmesh/blender/source/blender/imbuf/intern/allocimbuf.c
    branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
    branches/bmesh/blender/source/blender/makesdna/DNA_camera_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
    branches/bmesh/blender/source/blender/makesrna/RNA_access.h
    branches/bmesh/blender/source/blender/makesrna/SConscript
    branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/bmesh/blender/source/blender/makesrna/intern/SConscript
    branches/bmesh/blender/source/blender/makesrna/intern/rna_camera.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_color.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_key.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_property.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_world.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/bmesh/blender/source/creator/creator.c
    branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/BL_Material.h

Added Paths:
-----------
    branches/bmesh/blender/build_files/cmake/cmake_netbeans_project.py
    branches/bmesh/blender/build_files/cmake/project_info.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/
    branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/object_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py

Removed Paths:
-------------
    branches/bmesh/blender/release/release_todo.txt
    branches/bmesh/blender/release/scripts/modules/add_object_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/io_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/object_utils.py
    branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/bmesh/blender/release/scripts/modules/image_utils.py
    branches/bmesh/blender/release/scripts/modules/io_utils.py
    branches/bmesh/blender/release/scripts/modules/mesh_utils.py
    branches/bmesh/blender/release/scripts/modules/view3d_utils.py

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
    branches/bmesh/blender/build_files/cmake/cmake_qtcreator_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
    branches/bmesh/blender/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/VideoTexture/CMakeLists.txt


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:31524-36672
   + /trunk/blender:31524-36725

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2011-05-17 06:56:10 UTC (rev 36725)
+++ branches/bmesh/blender/CMakeLists.txt	2011-05-17 07:03:12 UTC (rev 36726)
@@ -202,9 +202,6 @@
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
 endif()
 
-# only for developers who want to make this functional
-# option(WITH_LCMS          "Enable color correction with lcms" OFF)
-
 if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
@@ -379,13 +376,6 @@
 
 	find_package(ZLIB REQUIRED)
 
-	if(WITH_LCMS)
-		set(LCMS /usr CACHE FILEPATH "LCMS directory")
-		set(LCMS_INCLUDE_DIR ${LCMS}/include)
-		set(LCMS_LIBRARY lcms)
-		set(LCMS_LIBPATH ${LCMS}/lib)
-	endif()
-
 	if(WITH_CODEC_FFMPEG)
 		set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
 		mark_as_advanced(FFMPEG)
@@ -430,7 +420,7 @@
 
 	if(WITH_MEM_JEMALLOC)
 		set(JEMALLOC /usr)
-		set(JEMALLOC_LIBRARY ljemalloc CACHE STRING "JeMalloc library")
+		set(JEMALLOC_LIBRARY jemalloc CACHE STRING "JeMalloc library")
 		set(JEMALLOC_LIBPATH ${JEMALLOC}/lib  CACHE FILEPATH "JeMalloc library path")
 		# no use for this yet.
 		# set(JEMALLOC_INCLUDE_DIR ${JEMALLOC}/include  CACHE FILEPATH "JeMalloc include path")
@@ -640,14 +630,7 @@
 			set(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa UTF)
 			set(PCRE_LIB pcre)
 		endif()
-		
-		if(WITH_LCMS)
-			set(LCMS ${LIBDIR}/lcms)
-			set(LCMS_INCLUDE_DIR ${LCMS}/include)
-			set(LCMS_LIBPATH ${LCMS}/lib)
-			set(LCMS_LIB lcms)
-		endif()
-
+	
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
@@ -910,13 +893,6 @@
 		set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 	endif()
 
-	if(WITH_LCMS)
-		set(LCMS ${LIBDIR}/lcms)
-		set(LCMS_INCLUDE_DIR ${LCMS}/include)
-		set(LCMS_LIBRARY lcms)
-		set(LCMS_LIBPATH ${LCMS}/lib)
-	endif()
-
 	if(WITH_CODEC_FFMPEG)
 		set(FFMPEG ${LIBDIR}/ffmpeg)
 		set(FFMPEG_INC ${FFMPEG}/include)


Property changes on: branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
___________________________________________________________________
Added: svn:executable
   + *

Copied: branches/bmesh/blender/build_files/cmake/cmake_netbeans_project.py (from rev 36723, trunk/blender/build_files/cmake/cmake_netbeans_project.py)
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_netbeans_project.py	                        (rev 0)
+++ branches/bmesh/blender/build_files/cmake/cmake_netbeans_project.py	2011-05-17 07:03:12 UTC (rev 36726)
@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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, M.G. Kishalmi
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
+"""
+Example linux usage
+ python .~/blenderSVN/blender/build_files/cmake/cmake_netbeans_project.py ~/blenderSVN/cmake
+
+Windows not supported so far
+"""
+
+from project_info import *
+
+import os
+from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+
+
+def create_nb_project_main():
+    files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
+    files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+    files_rel.sort()
+
+    if SIMPLE_PROJECTFILE:
+        pass
+    else:
+        includes, defines = cmake_advanced_info()
+        # for some reason it doesnt give all internal includes
+        includes = list(set(includes) | set(dirname(f) for f in files if is_c_header(f)))
+        includes.sort()
+
+        PROJECT_NAME = "Blender"
+        FILE_NAME = PROJECT_NAME.lower()
+
+        # --------------- NB spesific
+        defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
+        defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
+
+        def file_list_to_nested(files):
+            # convert paths to hierarchy
+            paths_nested = {}
+
+            def ensure_path(filepath):
+                filepath_split = filepath.split(os.sep)
+
+                pn = paths_nested
+                for subdir in filepath_split[:-1]:
+                    pn = pn.setdefault(subdir, {})
+                pn[filepath_split[-1]] = None
+
+            for path in files:
+                ensure_path(path)
+            return paths_nested
+
+        PROJECT_DIR_NB = join(PROJECT_DIR, "nbproject")
+        if not exists(PROJECT_DIR_NB):
+            os.mkdir(PROJECT_DIR_NB)
+
+        SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
+
+        f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
+
+        f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
+        f.write('<project xmlns="http://www.netbeans.org/ns/project/1">\n')
+        f.write('    <type>org.netbeans.modules.cnd.makeproject</type>\n')
+        f.write('    <configuration>\n')
+        f.write('        <data xmlns="http://www.netbeans.org/ns/make-project/1">\n')
+        f.write('            <name>%s</name>\n' % PROJECT_NAME)
+        f.write('            <c-extensions>c,m</c-extensions>\n')
+        f.write('            <cpp-extensions>cpp,mm</cpp-extensions>\n')
+        f.write('            <header-extensions>h,hpp,inl</header-extensions>\n')
+        f.write('            <sourceEncoding>UTF-8</sourceEncoding>\n')
+        f.write('            <make-dep-projects/>\n')
+        f.write('            <sourceRootList>\n')
+        f.write('                <sourceRootElem>%s</sourceRootElem>\n' % SOURCE_DIR)  # base_root_rel
+        f.write('            </sourceRootList>\n')
+        f.write('            <confList>\n')
+        f.write('                <confElem>\n')
+        f.write('                    <name>Default</name>\n')
+        f.write('                    <type>0</type>\n')
+        f.write('                </confElem>\n')
+        f.write('            </confList>\n')
+        f.write('        </data>\n')
+        f.write('    </configuration>\n')
+        f.write('</project>\n')
+
+        f = open(join(PROJECT_DIR_NB, "configurations.xml"), 'w')
+
+        f.write('<?xml version="1.0" encoding="UTF-8"?>\n')
+        f.write('<configurationDescriptor version="79">\n')
+        f.write('  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">\n')
+        f.write('    <df name="blender" root="%s">\n' % SOURCE_DIR)  # base_root_rel
+
+        # write files!
+        files_rel_local = [normpath(relpath(join(CMAKE_DIR, path), SOURCE_DIR)) for path in files_rel]
+        files_rel_hierarchy = file_list_to_nested(files_rel_local)
+        # print(files_rel_hierarchy)
+
+        def write_df(hdir, ident):
+            dirs = []
+            files = []
+            for key, item in sorted(hdir.items()):
+                if item is None:
+                    files.append(key)
+                else:
+                    dirs.append((key, item))
+
+            for key, item in dirs:
+                f.write('%s  <df name="%s">\n' % (ident, key))
+                write_df(item, ident + "  ")
+                f.write('%s  </df>\n' % ident)
+
+            for key in files:
+                f.write('%s<in>%s</in>\n' % (ident, key))
+
+        write_df(files_rel_hierarchy, ident="    ")
+
+        f.write('    </df>\n')
+
+        f.write('    <logicalFolder name="ExternalFiles"\n')
+        f.write('                   displayName="Important Files"\n')
+        f.write('                   projectFiles="false"\n')
+        f.write('                   kind="IMPORTANT_FILES_FOLDER">\n')
+        # f.write('      <itemPath>../GNUmakefile</itemPath>\n')
+        f.write('    </logicalFolder>\n')
+
+        f.write('  </logicalFolder>\n')
+        # default, but this dir is infact not in blender dir so we can ignore it
+        # f.write('  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
+        f.write('  <sourceFolderFilter>^(nbproject|__pycache__|.*\.py|.*\.html|.*\.blend)$</sourceFolderFilter>\n')
+
+        f.write('  <sourceRootList>\n')
+        f.write('    <Elem>%s</Elem>\n' % SOURCE_DIR)  # base_root_rel
+        f.write('  </sourceRootList>\n')
+
+        f.write('  <projectmakefile>Makefile</projectmakefile>\n')
+
+        # paths again
+        f.write('  <confs>\n')
+        f.write('    <conf name="Default" type="0">\n')
+
+        f.write('      <toolsSet>\n')
+        f.write('        <remote-sources-mode>LOCAL_SOURCES</remote-sources-mode>\n')
+        f.write('        <compilerSet>default</compilerSet>\n')
+        f.write('      </toolsSet>\n')
+        f.write('      <makefileType>\n')
+
+        f.write('        <makeTool>\n')
+        f.write('          <buildCommandWorkingDir>.</buildCommandWorkingDir>\n')
+        f.write('          <buildCommand>${MAKE} -f Makefile</buildCommand>\n')
+        f.write('          <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>\n')
+        f.write('          <executablePath>./bin/blender</executablePath>\n')
+
+        def write_toolinfo():
+            f.write('            <incDir>\n')
+            for inc in includes:
+                f.write('              <pElem>%s</pElem>\n' % inc)
+            f.write('            </incDir>\n')
+            f.write('            <preprocessorList>\n')
+            for cdef in defines:
+                f.write('              <Elem>%s</Elem>\n' % cdef)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list