[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42551] branches/bmesh/blender: svn merge ^/trunk/blender -r42521:42550
Campbell Barton
ideasman42 at gmail.com
Sat Dec 10 06:38:10 CET 2011
Revision: 42551
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42551
Author: campbellbarton
Date: 2011-12-10 05:38:00 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42521:42550
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42521
Modified Paths:
--------------
branches/bmesh/blender/doc/manpage/blender.1
branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp
branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.h
branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
branches/bmesh/blender/source/blender/blenkernel/intern/editderivedmesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh_validate.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/object/object_select.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tree.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/gpu/GPU_material.h
branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_hook.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c
branches/bmesh/blender/source/blender/python/intern/gpu.c
branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
branches/bmesh/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_BlenderShader.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
- /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42521
+ /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42550
Modified: branches/bmesh/blender/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp 2011-12-10 05:38:00 UTC (rev 42551)
@@ -233,9 +233,9 @@
BL::Object::material_slots_iterator slot;
for(b_ob.material_slots.begin(slot); slot != b_ob.material_slots.end(); ++slot) {
if(render_layer.material_override)
- find_shader(render_layer.material_override, used_shaders);
+ find_shader(render_layer.material_override, used_shaders, scene->default_surface);
else
- find_shader(slot->material(), used_shaders);
+ find_shader(slot->material(), used_shaders, scene->default_surface);
}
if(used_shaders.size() == 0)
Modified: branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_object.cpp 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/intern/cycles/blender/blender_object.cpp 2011-12-10 05:38:00 UTC (rev 42551)
@@ -137,7 +137,7 @@
/* shader */
vector<uint> used_shaders;
- find_shader(b_lamp, used_shaders);
+ find_shader(b_lamp, used_shaders, scene->default_light);
if(used_shaders.size() == 0)
used_shaders.push_back(scene->default_light);
Modified: branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp 2011-12-10 05:38:00 UTC (rev 42551)
@@ -36,9 +36,9 @@
/* Find */
-void BlenderSync::find_shader(BL::ID id, vector<uint>& used_shaders)
+void BlenderSync::find_shader(BL::ID id, vector<uint>& used_shaders, int default_shader)
{
- Shader *shader = shader_map.find(id);
+ Shader *shader = (id)? shader_map.find(id): scene->shaders[default_shader];
for(size_t i = 0; i < scene->shaders.size(); i++) {
if(scene->shaders[i] == shader) {
Modified: branches/bmesh/blender/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/blender_sync.h 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/intern/cycles/blender/blender_sync.h 2011-12-10 05:38:00 UTC (rev 42551)
@@ -81,7 +81,7 @@
void sync_light(BL::Object b_parent, int b_index, BL::Object b_ob, Transform& tfm);
/* util */
- void find_shader(BL::ID id, vector<uint>& used_shaders);
+ void find_shader(BL::ID id, vector<uint>& used_shaders, int default_shader);
bool object_is_modified(BL::Object b_ob);
bool object_is_mesh(BL::Object b_ob);
bool object_is_light(BL::Object b_ob);
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42516
+ /trunk/blender/release:31524-42516,42522-42548
Modified: branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/release/scripts/modules/bpy_extras/image_utils.py 2011-12-10 05:38:00 UTC (rev 42551)
@@ -65,19 +65,45 @@
# TODO: recursive
+ # -------------------------------------------------------------------------
+ # Utility Functions
+
+ def _image_load_placeholder(path):
+ name = bpy.path.basename(path)
+ if type(name) == bytes:
+ name = name.decode('utf-8', "replace")
+ image = bpy.data.images.new(name, 128, 128)
+ # allow the path to be resolved later
+ image.filepath = path
+ image.source = 'FILE'
+ return image
+
def _image_load(path):
import bpy
if convert_callback:
path = convert_callback(path)
- image = bpy.data.images.load(path)
+ try:
+ image = bpy.data.images.load(path)
+ except RuntimeError:
+ image = None
if verbose:
- print(" image loaded '%s'" % path)
+ if image:
+ print(" image loaded '%s'" % path)
+ else:
+ print(" image load failed '%s'" % path)
+ # image path has been checked so the path could not be read for some
+ # reason, so be sure to return a placeholder
+ if place_holder:
+ image = _image_load_placeholder(path)
+
return image
+ # -------------------------------------------------------------------------
+
if verbose:
print("load_image('%s', '%s', ...)" % (imagepath, dirname))
@@ -103,11 +129,9 @@
if os.path.exists(nfilepath):
return _image_load(nfilepath)
+ # None of the paths exist so return placeholder
if place_holder:
- image = bpy.data.images.new(bpy.path.basename(imagepath), 128, 128)
- # allow the path to be resolved later
- image.filepath = imagepath
- return image
+ return _image_load_placeholder(imagepath)
# TODO comprehensiveImageLoad also searched in bpy.config.textureDir
return None
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/object_randomize_transform.py 2011-12-10 05:38:00 UTC (rev 42551)
@@ -22,6 +22,7 @@
from bpy.types import Operator
from mathutils import Vector
+
def randomize_selected(seed, delta, loc, rot, scale, scale_even, scale_min):
import random
@@ -42,8 +43,13 @@
else: # otherwise the values change under us
uniform(0.0, 0.0), uniform(0.0, 0.0), uniform(0.0, 0.0)
- if rot: # TODO, non euler's
+ if rot:
vec = rand_vec(rot)
+
+ rotation_mode = obj.rotation_mode
+ if rotation_mode in {'QUATERNION', 'AXIS_ANGLE'}:
+ obj.rotation_mode = 'XYZ'
+
if delta:
obj.delta_rotation_euler[0] += vec[0]
obj.delta_rotation_euler[1] += vec[1]
@@ -52,6 +58,7 @@
obj.rotation_euler[0] += vec[0]
obj.rotation_euler[1] += vec[1]
obj.rotation_euler[2] += vec[2]
+ obj.rotation_mode = rotation_mode
else:
uniform(0.0, 0.0), uniform(0.0, 0.0), uniform(0.0, 0.0)
Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py 2011-12-10 05:38:00 UTC (rev 42551)
@@ -457,8 +457,8 @@
class WM_OT_context_cycle_array(Operator):
- '''Set a context array value.
- Useful for cycling the active mesh edit mode'''
+ '''Set a context array value. '''
+ '''Useful for cycling the active mesh edit mode'''
bl_idname = "wm.context_cycle_array"
bl_label = "Context Array Cycle"
bl_options = {'UNDO', 'INTERNAL'}
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2011-12-10 05:38:00 UTC (rev 42551)
@@ -128,6 +128,7 @@
BVHCache bvhCache;
struct GPUDrawObject *drawObject;
DerivedMeshType type;
+ float auto_bump_scale;
/* calculate vert and face normals */
void (*calcNormals)(DerivedMesh *dm);
@@ -655,6 +656,7 @@
struct GPUVertexAttribs *gattribs, DMVertexAttribs *attribs);
void DM_add_tangent_layer(DerivedMesh *dm);
+void DM_calc_auto_bump_scale(DerivedMesh *dm);
/* Set object's bounding box based on DerivedMesh min/max data */
void DM_set_object_boundbox(struct Object *ob, DerivedMesh *dm);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h 2011-12-10 05:38:00 UTC (rev 42551)
@@ -63,7 +63,7 @@
void defvert_sync(struct MDeformVert *dvert_dst, const struct MDeformVert *dvert_src, int use_verify);
void defvert_sync_mapped(struct MDeformVert *dvert_dst, const struct MDeformVert *dvert_src,
const int *flip_map, const int flip_map_len, const int use_verify);
-void defvert_remap (struct MDeformVert *dvert, int *map);
+void defvert_remap (struct MDeformVert *dvert, int *map, const int map_len);
void defvert_flip(struct MDeformVert *dvert, const int *flip_map, const int flip_map_len);
void defvert_normalize(struct MDeformVert *dvert);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-12-10 03:37:37 UTC (rev 42550)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c 2011-12-10 05:38:00 UTC (rev 42551)
@@ -276,6 +276,7 @@
DM_init_funcs(dm);
dm->needsFree = 1;
+ dm->auto_bump_scale = -1.0f;
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list