[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42117] branches/bmesh/blender: svn merge ^/trunk/blender -r42095:42116
Campbell Barton
ideasman42 at gmail.com
Thu Nov 24 06:33:30 CET 2011
Revision: 42117
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42117
Author: campbellbarton
Date: 2011-11-24 05:33:22 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42095:42116
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42095
Modified Paths:
--------------
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/doc/python_api/rst/gpu.rst
branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_lightmap.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/properties_physics_dynamicpaint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
branches/bmesh/blender/source/blender/blenlib/intern/math_vector.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/collada/GeometryExporter.cpp
branches/bmesh/blender/source/blender/collada/InstanceWriter.cpp
branches/bmesh/blender/source/blender/collada/MeshImporter.cpp
branches/bmesh/blender/source/blender/editors/animation/fmodifier_ui.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil_buttons.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
branches/bmesh/blender/source/blender/editors/space_nla/nla_buttons.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_dynamicpaint.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_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_uvproject.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.h
branches/bmesh/blender/source/blender/python/mathutils/mathutils_geometry.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/bmesh/blender/source/gameengine/Expressions/PyObjectPlus.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PyMath.cpp
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-42095
+ /trunk/blender:39992-42116
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2011-11-24 05:18:26 UTC (rev 42116)
+++ branches/bmesh/blender/GNUmakefile 2011-11-24 05:33:22 UTC (rev 42117)
@@ -93,6 +93,17 @@
# -----------------------------------------------------------------------------
+# Tool for 'make config'
+
+# X11 spesific
+ifdef DISPLAY
+ CMAKE_CONFIG_TOOL = cmake-gui
+else
+ CMAKE_CONFIG_TOOL = ccmake
+endif
+
+
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@@ -115,8 +126,15 @@
headless: all
bpy: all
+
# -----------------------------------------------------------------------------
-# Helo for build targets
+# Configuration (save some cd'ing around)
+config:
+ $(CMAKE_CONFIG_TOOL) $(BUILD_DIR)
+
+
+# -----------------------------------------------------------------------------
+# Help for build targets
help:
@echo ""
@echo "Convenience targets provided for building blender, (multiple at once can be used)"
@@ -125,6 +143,8 @@
@echo " * headless - build without an interface (renderfarm or server automation)"
@echo " * bpy - build as a python module which can be loaded from python directly"
@echo ""
+ @echo " * config - run cmake configuration tool to set build options"
+ @echo ""
@echo " Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
@echo " Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
@echo ""
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-11-24 05:18:26 UTC (rev 42116)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-11-24 05:33:22 UTC (rev 42117)
@@ -319,20 +319,11 @@
incs = ['#/intern/guardedalloc', '#/source/blender/blenlib', '#/source/blender/blenkernel', '#/source/blender/editors/include', '#/source/blender/blenloader', '#/source/blender/imbuf', '#/source/blender/renderconverter', '#/source/blender/render/extern/include', '#/source/blender/windowmanager', '#/source/blender/makesdna', '#/source/blender/makesrna', '#/source/gameengine/BlenderRoutines', '#/extern/glew/include', '#/source/blender/gpu', env['BF_OPENGL_INC']]
defs = []
- if env['WITH_BF_QUICKTIME']:
- incs.append(env['BF_QUICKTIME_INC'])
- defs.append('WITH_QUICKTIME')
if env['WITH_BF_BINRELOC']:
incs.append('#/extern/binreloc/include')
defs.append('WITH_BINRELOC')
- if env['WITH_BF_OPENEXR']:
- defs.append('WITH_OPENEXR')
-
- if env['WITH_BF_TIFF']:
- defs.append('WITH_TIFF')
-
if env['WITH_BF_SDL']:
defs.append('WITH_SDL')
Modified: branches/bmesh/blender/doc/python_api/rst/gpu.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/gpu.rst 2011-11-24 05:18:26 UTC (rev 42116)
+++ branches/bmesh/blender/doc/python_api/rst/gpu.rst 2011-11-24 05:33:22 UTC (rev 42117)
@@ -278,7 +278,7 @@
.. data:: CD_MTFACE
- Vertex attribute is a UV layer. Data type is vector of 2 float.
+ Vertex attribute is a UV Map. Data type is vector of 2 float.
There can be more than one attribute of that type, they are differenciated by name.
In blender, you can retrieve the attribute data with:
@@ -495,10 +495,10 @@
for uniform in shader['uniforms']:
if uniform['type'] == gpu.GPU_DYNAMIC_SAMPLER_2DIMAGE:
print("uniform {0} is using image {1}".format(uniform['varname'], uniform['image'].filepath))
- # scan the attribute list and find the UV layer used in the shader
+ # scan the attribute list and find the UV Map used in the shader
for attribute in shader['attributes']:
if attribute['type'] == gpu.CD_MTFACE:
- print("attribute {0} is using UV layer {1}".format(attribute['varname'], attribute['name']))
+ print("attribute {0} is using UV Map {1}".format(attribute['varname'], attribute['name']))
*****
Notes
Modified: branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
===================================================================
--- branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc 2011-11-24 05:18:26 UTC (rev 42116)
+++ branches/bmesh/blender/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc 2011-11-24 05:33:22 UTC (rev 42117)
@@ -201,6 +201,8 @@
warp_y = warp_y*aspy + 0.5 * overscan * h;
int ix = int(warp_x), iy = int(warp_y);
int fx = round((warp_x-ix)*256), fy = round((warp_y-iy)*256);
+ if(fx == 256) { fx=0; ix++; }
+ if(fy == 256) { fy=0; iy++; }
// Use nearest border pixel
if( ix < 0 ) { ix = 0, fx = 0; }
if( iy < 0 ) { iy = 0, fy = 0; }
Modified: branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp 2011-11-24 05:18:26 UTC (rev 42116)
+++ branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp 2011-11-24 05:33:22 UTC (rev 42117)
@@ -144,7 +144,7 @@
}
}
- /* create uv layer attributes */
+ /* create uv map attributes */
{
BL::Mesh::uv_textures_iterator l;
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42095
+ /trunk/blender/release:31524-42116
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2011-11-24 05:18:26 UTC (rev 42116)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py 2011-11-24 05:33:22 UTC (rev 42117)
@@ -21,9 +21,47 @@
import os
import shutil
from bpy.types import Operator
-from bpy_extras.io_utils import unpack_list
+from bpy_extras.io_utils import unpack_list, unpack_face_list
+from mathutils import Vector, Matrix
+
+def CLIP_spacees_walk(context, all_screens, tarea, tspace, callback, *args):
+ screens = bpy.data.screens if all_screens else [context.screen]
+
+ for screen in screens:
+ for area in screen.areas:
+ if area.type == tarea:
+ for space in area.spaces:
+ if space.type == tspace:
+ callback(space, *args)
+
+
+def CLIP_set_viewport_background(context, all_screens, clip, clip_user):
+ def set_background(space_v3d, clip, user):
+ bgpic = None
+
+ for x in space_v3d.background_images:
+ if x.source == 'MOVIE':
+ bgpic = x
+ break
+
+ if not bgpic:
+ bgpic = space_v3d.background_images.new()
+
+ bgpic.source = 'MOVIE'
+ bgpic.clip = clip
+ bgpic.clip_user.proxy_render_size = user.proxy_render_size
+ bgpic.clip_user.use_render_undistorted = True
+ bgpic.use_camera_clip = False
+ bgpic.view_axis = 'CAMERA'
+
+ space_v3d.show_background_images = True
+
+ CLIP_spacees_walk(context, all_screens, 'VIEW_3D', 'VIEW_3D',
+ set_background, clip, clip_user)
+
+
def CLIP_track_view_selected(sc, track):
if track.select_anchor:
return True
@@ -51,8 +89,8 @@
ob = bpy.data.objects.new(name=track.name, object_data=None)
ob.select = True
- bpy.context.scene.objects.link(ob)
- bpy.context.scene.objects.active = ob
+ context.scene.objects.link(ob)
+ context.scene.objects.active = ob
for con in ob.constraints:
if con.type == 'FOLLOW_TRACK':
@@ -106,7 +144,7 @@
ob = bpy.data.objects.new(name="Tracks", object_data=mesh)
- bpy.context.scene.objects.link(ob)
+ context.scene.objects.link(ob)
return {'FINISHED'}
@@ -202,36 +240,10 @@
return sc.clip
- def _set_background(self, space_v3d, clip, user):
- bgpic = None
-
- for x in space_v3d.background_images:
- if x.source == 'MOVIE':
- bgpic = x
- break
-
- if not bgpic:
- bgpic = space_v3d.background_images.new()
-
- bgpic.source = 'MOVIE'
- bgpic.clip = clip
- bgpic.clip_user.proxy_render_size = user.proxy_render_size
- bgpic.clip_user.use_render_undistorted = user.use_render_undistorted
- bgpic.use_camera_clip = False
- bgpic.view_axis = 'CAMERA'
-
- space_v3d.show_background_images = True
-
def execute(self, context):
sc = context.space_data
- clip = sc.clip
+ CLIP_set_viewport_background(context, False, sc.clip, sc.clip_user)
- for area in context.window.screen.areas:
- if area.type == 'VIEW_3D':
- for space in area.spaces:
- if space.type == 'VIEW_3D':
- self._set_background(space, clip, sc.clip_user)
-
return {'FINISHED'}
@@ -332,3 +344,430 @@
self._bake_object(scene, ob)
return {'FINISHED'}
+
+
+class CLIP_OT_setup_tracking_scene(Operator):
+ """Prepare scene for compositing 3D objects into this footage"""
+
+ bl_idname = "clip.setup_tracking_scene"
+ bl_label = "Setup Tracking Scene"
+ bl_options = {'UNDO', 'REGISTER'}
+
+ @classmethod
+ def poll(cls, context):
+ sc = context.space_data
+
+ if sc.type != 'CLIP_EDITOR':
+ return False
+
+ clip = sc.clip
+
+ return clip and clip.tracking.reconstruction.is_valid
+
+ @staticmethod
+ def _setupScene(context):
+ scene = context.scene
+ scene.active_clip = context.space_data.clip
+
+ @staticmethod
+ def _setupWorld(context):
+ scene = context.scene
+ world = scene.world
+
+ if not world:
+ world = bpy.data.worlds.new(name="World")
+ scene.world = world
+
+ world.light_settings.use_ambient_occlusion = True
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list