[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30930] branches/soc-2010-kwk: svn merge -r 30833:30900 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Konrad Kleine
konrad at konradwilhelm.de
Sun Aug 1 12:20:40 CEST 2010
Revision: 30930
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30930
Author: kwk
Date: 2010-08-01 12:20:40 +0200 (Sun, 01 Aug 2010)
Log Message:
-----------
svn merge -r 30833:30900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2010-kwk/build_files/scons/config/win32-vc-config.py
branches/soc-2010-kwk/release/scripts/op/console_python.py
branches/soc-2010-kwk/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-kwk/release/scripts/ui/space_image.py
branches/soc-2010-kwk/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-kwk/source/blender/blenkernel/BKE_armature.h
branches/soc-2010-kwk/source/blender/blenkernel/BKE_colortools.h
branches/soc-2010-kwk/source/blender/blenkernel/BKE_image.h
branches/soc-2010-kwk/source/blender/blenkernel/BKE_text.h
branches/soc-2010-kwk/source/blender/blenkernel/BKE_texture.h
branches/soc-2010-kwk/source/blender/blenkernel/intern/armature.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/brush.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/deform.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/image.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/library.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/node.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/object.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/scene.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/text.c
branches/soc-2010-kwk/source/blender/blenkernel/intern/texture.c
branches/soc-2010-kwk/source/blender/blenloader/intern/readfile.c
branches/soc-2010-kwk/source/blender/editors/armature/editarmature.c
branches/soc-2010-kwk/source/blender/editors/armature/poseobject.c
branches/soc-2010-kwk/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-kwk/source/blender/editors/interface/interface_templates.c
branches/soc-2010-kwk/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-kwk/source/blender/editors/object/object_select.c
branches/soc-2010-kwk/source/blender/editors/physics/particle_edit.c
branches/soc-2010-kwk/source/blender/editors/render/render_shading.c
branches/soc-2010-kwk/source/blender/editors/screen/screen_edit.c
branches/soc-2010-kwk/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-kwk/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-kwk/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-kwk/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-kwk/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-kwk/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-kwk/source/blender/editors/space_text/text_ops.c
branches/soc-2010-kwk/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-kwk/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-kwk/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-kwk/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2010-kwk/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2010-kwk/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-kwk/source/blender/makesdna/DNA_image_types.h
branches/soc-2010-kwk/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-kwk/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-kwk/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/soc-2010-kwk/source/blender/python/intern/bpy_interface.c
branches/soc-2010-kwk/source/blender/python/intern/bpy_rna.c
branches/soc-2010-kwk/source/blender/render/intern/include/render_types.h
branches/soc-2010-kwk/source/blender/render/intern/include/renderdatabase.h
branches/soc-2010-kwk/source/blender/render/intern/source/convertblender.c
branches/soc-2010-kwk/source/blender/render/intern/source/rayshade.c
branches/soc-2010-kwk/source/blender/render/intern/source/renderdatabase.c
branches/soc-2010-kwk/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-kwk/source/blender/render/intern/source/volumetric.c
branches/soc-2010-kwk/source/darwin/Makefile
branches/soc-2010-kwk/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-kwk/source/gameengine/PyDoc/bge.types.rst
Modified: branches/soc-2010-kwk/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-kwk/build_files/scons/config/win32-vc-config.py 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/build_files/scons/config/win32-vc-config.py 2010-08-01 10:20:40 UTC (rev 30930)
@@ -130,7 +130,7 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-WITH_BF_FFTW3 = False
+WITH_BF_FFTW3 = True
BF_FFTW3 = LIBDIR + '/fftw3'
BF_FFTW3_INC = '${BF_FFTW3}/include'
BF_FFTW3_LIB = 'libfftw'
Modified: branches/soc-2010-kwk/release/scripts/op/console_python.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/op/console_python.py 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/release/scripts/op/console_python.py 2010-08-01 10:20:40 UTC (rev 30930)
@@ -22,6 +22,9 @@
language_id = 'python'
+# store our own __main__ module, not 100% needed
+# but python expects this in some places
+_BPY_MAIN_OWN = True
def add_scrollback(text, text_type):
for l in text.split('\n'):
@@ -67,8 +70,21 @@
stdout = io.StringIO()
stderr = io.StringIO()
else:
- namespace = {"__builtins__": __builtins__, "bpy": bpy, "C": bpy.context}
+ if _BPY_MAIN_OWN:
+ import types
+ bpy_main_mod = types.ModuleType("__main__")
+ namespace = bpy_main_mod.__dict__
+ else:
+ namespace = {}
+
+ namespace["__builtins__"] = sys.modules["builtins"]
+ namespace["bpy"] = bpy
+ namespace["C"] = bpy.context
+
console = InteractiveConsole(locals=namespace, filename="<blender_console>")
+
+ if _BPY_MAIN_OWN:
+ console._bpy_main_mod = bpy_main_mod
import io
stdout = io.StringIO()
@@ -105,6 +121,10 @@
stdin_backup = sys.stdin
sys.stdin = None
+ if _BPY_MAIN_OWN:
+ main_mod_back = sys.modules["__main__"]
+ sys.modules["__main__"] = console._bpy_main_mod
+
# incase exception happens
line = "" # incase of encodingf error
is_multiline = False
@@ -121,6 +141,8 @@
import traceback
stderr.write(traceback.format_exc())
+ if _BPY_MAIN_OWN:
+ sys.modules["__main__"] = main_mod_back
stdout.seek(0)
stderr.seek(0)
Modified: branches/soc-2010-kwk/release/scripts/ui/properties_data_mesh.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/ui/properties_data_mesh.py 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/release/scripts/ui/properties_data_mesh.py 2010-08-01 10:20:40 UTC (rev 30930)
@@ -114,7 +114,6 @@
col = split.column()
else:
col.separator()
- col.prop(mesh, "vertex_normal_flip")
col.prop(mesh, "double_sided")
Modified: branches/soc-2010-kwk/release/scripts/ui/space_image.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/ui/space_image.py 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/release/scripts/ui/space_image.py 2010-08-01 10:20:40 UTC (rev 30930)
@@ -678,7 +678,6 @@
row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
- row.operator("brush.curve_preset", icon="RNDCURVE", text="").shape = 'MID9'
class IMAGE_PT_paint_multi_channel(bpy.types.Panel):
bl_space_type = 'IMAGE_EDITOR'
Modified: branches/soc-2010-kwk/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-kwk/release/scripts/ui/space_view3d_toolbar.py 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/release/scripts/ui/space_view3d_toolbar.py 2010-08-01 10:20:40 UTC (rev 30930)
@@ -986,7 +986,6 @@
row.operator("brush.curve_preset", icon="SHARPCURVE", text="").shape = 'SHARP'
row.operator("brush.curve_preset", icon="LINCURVE", text="").shape = 'LINE'
row.operator("brush.curve_preset", icon="NOCURVE", text="").shape = 'MAX'
- row.operator("brush.curve_preset", icon="RNDCURVE", text="").shape = 'MID9'
class VIEW3D_PT_sculpt_options(PaintPanel):
bl_label = "Options"
Modified: branches/soc-2010-kwk/source/blender/blenkernel/BKE_armature.h
===================================================================
--- branches/soc-2010-kwk/source/blender/blenkernel/BKE_armature.h 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/source/blender/blenkernel/BKE_armature.h 2010-08-01 10:20:40 UTC (rev 30930)
@@ -80,7 +80,6 @@
void make_local_armature(struct bArmature *arm);
struct bArmature *copy_armature(struct bArmature *arm);
-void bone_flip_name (char *name, int strip_number);
int bone_autoside_name (char *name, int strip_number, short axis, float head, float tail);
struct Bone *get_named_bone (struct bArmature *arm, const char *name);
Modified: branches/soc-2010-kwk/source/blender/blenkernel/BKE_colortools.h
===================================================================
--- branches/soc-2010-kwk/source/blender/blenkernel/BKE_colortools.h 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/source/blender/blenkernel/BKE_colortools.h 2010-08-01 10:20:40 UTC (rev 30930)
@@ -53,9 +53,11 @@
struct CurveMapping *curvemapping_copy(struct CurveMapping *cumap);
void curvemapping_set_black_white(struct CurveMapping *cumap, float *black, float *white);
+#define CURVEMAP_SLOPE_NEGATIVE 0
+#define CURVEMAP_SLOPE_POSITIVE 1
+void curvemap_reset(struct CurveMap *cuma, struct rctf *clipr, int preset, int slope);
void curvemap_remove(struct CurveMap *cuma, int flag);
void curvemap_insert(struct CurveMap *cuma, float x, float y);
-void curvemap_reset(struct CurveMap *cuma, struct rctf *clipr, int preset);
void curvemap_sethandle(struct CurveMap *cuma, int type);
void curvemapping_changed(struct CurveMapping *cumap, int rem_doubles);
Modified: branches/soc-2010-kwk/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/soc-2010-kwk/source/blender/blenkernel/BKE_image.h 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/source/blender/blenkernel/BKE_image.h 2010-08-01 10:20:40 UTC (rev 30930)
@@ -159,7 +159,7 @@
void BKE_image_print_memlist(void);
/* empty image block, of similar type and filename */
-struct Image *BKE_image_copy(struct Image *ima);
+struct Image *copy_image(struct Image *ima);
/* merge source into dest, and free source */
void BKE_image_merge(struct Image *dest, struct Image *source);
Modified: branches/soc-2010-kwk/source/blender/blenkernel/BKE_text.h
===================================================================
--- branches/soc-2010-kwk/source/blender/blenkernel/BKE_text.h 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/source/blender/blenkernel/BKE_text.h 2010-08-01 10:20:40 UTC (rev 30930)
@@ -92,7 +92,7 @@
void comment (struct Text *text);
void indent (struct Text *text);
void uncomment (struct Text *text);
-int setcurr_tab (struct Text *text);
+int setcurr_tab_spaces (struct Text *text, int space);
void txt_add_marker (struct Text *text, struct TextLine *line, int start, int end, char color[4], int group, int flags);
short txt_clear_marker_region (struct Text *text, struct TextLine *line, int start, int end, int group, int flags);
Modified: branches/soc-2010-kwk/source/blender/blenkernel/BKE_texture.h
===================================================================
--- branches/soc-2010-kwk/source/blender/blenkernel/BKE_texture.h 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/source/blender/blenkernel/BKE_texture.h 2010-08-01 10:20:40 UTC (rev 30930)
@@ -61,6 +61,9 @@
struct ColorBand *add_colorband(int rangetype);
int do_colorband(struct ColorBand *coba, float in, float out[4]);
void colorband_table_RGBA(struct ColorBand *coba, float **array, int *size);
+int vergcband(const void *a1, const void *a2);
+struct CBData *colorband_element_add(struct ColorBand *coba, float position);
+int colorband_element_remove(struct ColorBand *coba, int index);
void default_tex(struct Tex *tex);
struct Tex *add_texture(const char *name);
Modified: branches/soc-2010-kwk/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/soc-2010-kwk/source/blender/blenkernel/intern/armature.c 2010-08-01 09:56:00 UTC (rev 30929)
+++ branches/soc-2010-kwk/source/blender/blenkernel/intern/armature.c 2010-08-01 10:20:40 UTC (rev 30930)
@@ -245,117 +245,6 @@
return bone;
}
-
-#define IS_SEPARATOR(a) (a=='.' || a==' ' || a=='-' || a=='_')
-
-/* finds the best possible flipped name. For renaming; check for unique names afterwards */
-/* if strip_number: removes number extensions */
-void bone_flip_name (char *name, int strip_number)
-{
- int len;
- char prefix[128]={""}; /* The part before the facing */
- char suffix[128]={""}; /* The part after the facing */
- char replace[128]={""}; /* The replacement string */
- char number[128]={""}; /* The number extension string */
- char *index=NULL;
-
- len= strlen(name);
- if(len<3) return; // we don't do names like .R or .L
-
- /* We first check the case with a .### extension, let's find the last period */
- if(isdigit(name[len-1])) {
- index= strrchr(name, '.'); // last occurrence
- if (index && isdigit(index[1]) ) { // doesnt handle case bone.1abc2 correct..., whatever!
- if(strip_number==0)
- strcpy(number, index);
- *index= 0;
- len= strlen(name);
- }
- }
-
- strcpy (prefix, name);
-
- /* first case; separator . - _ with extensions r R l L */
- if( IS_SEPARATOR(name[len-2]) ) {
- switch(name[len-1]) {
- case 'l':
- prefix[len-1]= 0;
- strcpy(replace, "r");
- break;
- case 'r':
- prefix[len-1]= 0;
- strcpy(replace, "l");
- break;
- case 'L':
- prefix[len-1]= 0;
- strcpy(replace, "R");
- break;
- case 'R':
- prefix[len-1]= 0;
- strcpy(replace, "L");
- break;
- }
- }
- /* case; beginning with r R l L , with separator after it */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list