Revision: 37390
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37390
Author: jwilkins
Date: 2011-06-10 22:01:35 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
Merged with Onion Branch: 37209-37387 (object_bake.c is also fixed)
D:\gsoc\soc-2011-salad>svn merge
^https://svn.blender.org/svnroot/bf-blender/branches/soc-2011-onion@37386
--non-interactive
--- Merging r37209 through r37386 into '.':
D:\gsoc\soc-2011-salad>svn merge
^https://svn.blender.org/svnroot/bf-blender/branches/soc-2011-onion@37387
--non-interactive
--- Merging r37387 into '.':
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37209
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37386
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37387
Modified Paths:
--------------
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/soc-2011-salad/intern/smoke/intern/MERSENNETWISTER.h
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_dmgrid.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_multires.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-salad/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-salad/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-salad/source/blender/blenkernel/intern/brush.c
branches/soc-2011-salad/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-salad/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-salad/source/blender/blenkernel/intern/multires.c
branches/soc-2011-salad/source/blender/blenkernel/intern/object.c
branches/soc-2011-salad/source/blender/blenkernel/intern/paint.c
branches/soc-2011-salad/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-salad/source/blender/blenlib/BLI_pbvh.h
branches/soc-2011-salad/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/blenloader/intern/writefile.c
branches/soc-2011-salad/source/blender/editors/include/ED_sculpt.h
branches/soc-2011-salad/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-salad/source/blender/editors/mesh/mesh_intern.h
branches/soc-2011-salad/source/blender/editors/mesh/mesh_ops.c
branches/soc-2011-salad/source/blender/editors/object/object_bake.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-salad/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-salad/source/blender/gpu/GPU_buffers.h
branches/soc-2011-salad/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-salad/source/blender/imbuf/intern/divers.c
branches/soc-2011-salad/source/blender/makesdna/DNA_brush_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_multires.c
Property Changed:
----------------
branches/soc-2011-salad/
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_mask.c
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29913
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37208
/branches/soc-2011-pepper:36830-37151
/trunk/blender:36834-37387
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/trunk/blender:36834-37387
Modified:
branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFunctions.cpp
===================================================================
--- branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFunctions.cpp
2011-06-10 21:28:46 UTC (rev 37389)
+++ branches/soc-2011-salad/intern/audaspace/intern/AUD_ConverterFunctions.cpp
2011-06-10 22:01:35 UTC (rev 37390)
@@ -33,8 +33,8 @@
#include "AUD_Buffer.h"
#define AUD_U8_0 0x80
-#define AUD_S16_MAX 0x7FFF
-#define AUD_S16_MIN 0x8000
+#define AUD_S16_MAX ((int16_t)0x7FFF)
+#define AUD_S16_MIN ((int16_t)0x8000)
#define AUD_S16_FLT 32768.0f
#define AUD_S32_MAX 0x7FFFFFFF
#define AUD_S32_MIN 0x80000000
Modified: branches/soc-2011-salad/intern/smoke/intern/MERSENNETWISTER.h
===================================================================
--- branches/soc-2011-salad/intern/smoke/intern/MERSENNETWISTER.h
2011-06-10 21:28:46 UTC (rev 37389)
+++ branches/soc-2011-salad/intern/smoke/intern/MERSENNETWISTER.h
2011-06-10 22:01:35 UTC (rev 37390)
@@ -73,6 +73,7 @@
// Data
public:
typedef unsigned long uint32; // unsigned integer type, at least 32
bits
+ typedef signed long int32; // signed integer type, at least 32 bits
enum { N = 624 }; // length of state vector
enum { SAVE = N + 1 }; // length of array for save()
@@ -132,7 +133,7 @@
uint32 mixBits( const uint32& u, const uint32& v ) const
{ return hiBit(u) | loBits(v); }
uint32 twist( const uint32& m, const uint32& s0, const uint32& s1 )
const
- { return m ^ (mixBits(s0,s1)>>1) ^ (-loBit(s1) & 0x9908b0dfUL);
}
+ { return m ^ (mixBits(s0,s1)>>1) ^ ((uint32)(-(int32)loBit(s1))
& 0x9908b0dfUL); }
static uint32 hash( time_t t, clock_t c );
};
Modified:
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
---
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_mesh.py
2011-06-10 21:28:46 UTC (rev 37389)
+++
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_mesh.py
2011-06-10 22:01:35 UTC (rev 37390)
@@ -353,7 +353,12 @@
if lay:
layout.prop(lay, "name")
+ if lay.multiresolution:
+ layout.operator("mesh.vertex_color_multiresolution_toggle",
text="Remove Multires")
+ else:
+ layout.operator("mesh.vertex_color_multiresolution_toggle",
text="Add Multires")
+
class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel,
bpy.types.Panel):
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
_context_path = "object.data"
Modified:
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
---
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-06-10 21:28:46 UTC (rev 37389)
+++
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_modifier.py
2011-06-10 22:01:35 UTC (rev 37390)
@@ -384,7 +384,7 @@
split = layout.split()
col = split.column()
col.prop(md, "levels", text="Preview")
- col.prop(md, "sculpt_levels", text="Sculpt")
+ col.prop(md, "edit_levels", text="Edit")
col.prop(md, "render_levels", text="Render")
col = split.column()
Modified:
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
2011-06-10 21:28:46 UTC (rev 37389)
+++ branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
2011-06-10 22:01:35 UTC (rev 37390)
@@ -198,6 +198,7 @@
col.prop(view, "use_mouse_auto_depth")
col.prop(view, "use_zoom_to_mouse")
col.prop(view, "use_rotate_around_active")
+ col.prop(view, "use_rotate_around_last_stroke")
col.prop(view, "use_global_pivot")
col.prop(view, "use_camera_lock_parent")
Modified:
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
---
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-06-10 21:28:46 UTC (rev 37389)
+++
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-06-10 22:01:35 UTC (rev 37390)
@@ -754,6 +754,7 @@
def poll(cls, context):
settings = cls.paint_settings(context)
return (settings and settings.brush and (context.sculpt_object or
+ context.vertex_paint_object or
context.image_paint_object))
def draw(self, context):
@@ -769,7 +770,7 @@
if brush.use_paint_image:
col.prop(brush, "use_fixed_texture")
- if context.sculpt_object:
+ if context.sculpt_object or context.vertex_paint_object:
#XXX duplicated from properties_texture.py
col.separator()
Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_customdata.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_customdata.h
2011-06-10 21:28:46 UTC (rev 37389)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_customdata.h
2011-06-10 22:01:35 UTC (rev 37390)
@@ -43,6 +43,7 @@
struct ID;
struct CustomData;
struct CustomDataLayer;
+struct CustomDataMultires;
typedef unsigned int CustomDataMask;
extern const CustomDataMask CD_MASK_BAREMESH;
@@ -243,6 +244,8 @@
int CustomData_get_clone_layer(const struct CustomData *data, int type);
int CustomData_get_stencil_layer(const struct CustomData *data, int type);
+char *CustomData_get_layer_name_at_offset(const struct CustomData *data, int
type, int offset);
+
/* copies the data from source to the data element at index in the first
* layer of type
* no effect if there is no layer of type
@@ -280,6 +283,7 @@
/* adds flag to the layer flags */
void CustomData_set_layer_flag(struct CustomData *data, int type, int flag);
+void CustomData_set_layer_offset_flag(struct CustomData *data, int type, int
offset, int flag);
/* alloc/free a block of custom data attached to one element in editmode */
void CustomData_em_set_default(struct CustomData *data, void **block);
@@ -320,8 +324,39 @@
void CustomData_bmesh_init_pool(struct CustomData *data, int allocsize);
/* Subsurf grids */
-void CustomData_set_num_grid_elements(struct CustomData *data, int grid_elems);
+/* return the number of layers of type that have multires data */
+int CustomData_get_multires_count(struct CustomData *cd, int type);
+
+/* allocates a list of names of layers that have multires data */
+void *CustomData_get_multires_names(struct CustomData *cd, int type);
+
+/* number of floats used per-element for the multires of a customdata type */
+int CustomData_multires_type_totfloat(int type);
+
+/* returns the multires data for a layer matching name and type,
+ or NULL if no such layer found */
+float *CustomData_multires_get_data(struct CustomDataMultires *cdm, int type,
+ char *name);
+
+/* if layer matching type and name exists, free and replace its griddata
+ otherwise create the layer and set its griddata */
+void CustomData_multires_assign_data(struct CustomDataMultires *cdm, int type,
+ char *name, float *data);
+
+/* insert a multires layer of the specified type */
+void CustomData_multires_add_layer(struct CustomDataMultires *cdm, int type,
+ char *name, float *data);
+
+/* remove the multires layer with matching source name
+ returns 1 if succesful, 0 otherwise */
+int CustomData_multires_remove_layer(struct CustomDataMultires *cdm, int type,
+ char *name);
+
+/* rename a layer matching type and old_name */
+void CustomData_multires_rename(struct CustomDataMultires *cdm, int type,
+ char *old_name, char *name);
+
/* External file storage */
void CustomData_external_add(struct CustomData *data,
Modified: branches/soc-2011-salad/source/blender/blenkernel/BKE_dmgrid.h
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/BKE_dmgrid.h
2011-06-10 21:28:46 UTC (rev 37389)
+++ branches/soc-2011-salad/source/blender/blenkernel/BKE_dmgrid.h
2011-06-10 22:01:35 UTC (rev 37390)
@@ -4,32 +4,45 @@
/* Each grid element can contain zero or more layers of coordinates,
paint masks, and normals; these numbers are stored in the GridKey
- For now, co and no can have only zero or one layers, only mask is
- really variable.
+ The name arrays are the unique names of the source customdata layer
*/
typedef struct GridKey {
int co;
+ int color;
int mask;
int no;
+
+ /* key to identify the source layer */
+ char (*color_names)[32];
+ char (*mask_names)[32];
} GridKey;
-#define GRIDELEM_KEY_INIT(_gridkey, _totco, _totmask, _totno) \
- ((_gridkey)->co = _totco, (_gridkey)->mask = _totmask, (_gridkey)->no =
_totno)
+#define GRIDELEM_KEY_INIT(_key, _totco, _totcolor, _totmask, _totno) \
+ ((_key)->co = _totco, (_key)->color = _totcolor, \
+ (_key)->mask = _totmask, (_key)->no = _totno, \
+ (_key)->color_names = NULL, (_key)->mask_names = NULL)
-#define GRIDELEM_SIZE(_key) ((3*(_key)->co + (_key)->mask + 3*(_key)->no) *
sizeof(float))
-#define GRIDELEM_MASK_OFFSET(_key) ((_key)->mask ? 3*(_key)->co*sizeof(float)
: -1)
-#define GRIDELEM_NO_OFFSET(_key) ((_key)->no ? (3*(_key)->co + (_key)->mask) *
sizeof(float) : -1)
-#define GRIDELEM_INTERP_COUNT(_key) (3*(_key)->co + (_key)->mask)
+#define GRIDELEM_SIZE(_key) ((3*(_key)->co + 4*(_key)->color + (_key)->mask +
3*(_key)->no) * sizeof(float))
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
