[Bf-blender-cvs] [0b00a6d] soc-2013-paint: More review points taken care of
Antony Riakiotakis
noreply at git.blender.org
Wed Jul 9 22:29:06 CEST 2014
Commit: 0b00a6d029a10d590784536d262b2977d6a4cf7e
Author: Antony Riakiotakis
Date: Wed Jul 9 22:29:42 2014 +0300
https://developer.blender.org/rB0b00a6d029a10d590784536d262b2977d6a4cf7e
More review points taken care of
===================================================================
M source/blender/blenkernel/intern/material.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/makesrna/intern/rna_material.c
===================================================================
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 39624f5..f3c2dd5 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -1333,7 +1333,6 @@ void BKE_refresh_texpaint_slot_cache(Material *ma, bool use_nodes)
if (!ma)
return;
- /* blender internal calculation goes here */
if (ma->texpaintslot) {
MEM_freeN(ma->texpaintslot);
ma->texpaintslot = NULL;
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index a97145f..b9e5c5f 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -823,8 +823,6 @@ int UI_drop_color_poll(struct bContext *C, wmDrag *drag, const wmEvent *UNUSED(e
if (UI_but_active_drop_color(C))
return 1;
- /* should only return true for regions that include buttons, for now
- * return true always */
if (sima && (sima->mode == SI_MODE_PAINT) &&
sima->image && (ar && ar->regiontype == RGN_TYPE_WINDOW))
{
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 792f430..b5527f3 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2334,7 +2334,6 @@ void uiTemplateColorPicker(uiLayout *layout, PointerRNA *ptr, const char *propna
}
}
-/* This template now follows User Preference for type - name is not correct anymore... */
void uiTemplatePalette(uiLayout *layout, PointerRNA *ptr, const char *propname, int UNUSED(colors))
{
PropertyRNA *prop = RNA_struct_find_property(ptr, propname);
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 6894665..2a206e1 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -500,7 +500,6 @@ void imapaint_image_update(SpaceImage *sima, Image *image, ImBuf *ibuf, short te
}
/* paint blur kernels */
-
BlurKernel *paint_new_blur_kernel(Brush *br)
{
int i, j;
@@ -1339,7 +1338,7 @@ static int texture_paint_toggle_poll(bContext *C)
}
-/* Make sure that active object has a material, and assign UVs and image layers (TODO) if they do not exist */
+/* Make sure that active object has a material, and assign UVs and image layers if they do not exist */
void paint_proj_mesh_data_ensure(bContext *C, Object *ob, wmOperator *op)
{
Mesh *me;
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index efaee37..570cf32 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -182,7 +182,7 @@ typedef struct ProjPaintImage {
Image *ima;
ImBuf *ibuf;
ImagePaintPartialRedraw *partRedrawRect;
- volatile void **undoRect; /* only used to build undo tiles after painting */
+ volatile void **undoRect; /* only used to build undo tiles during painting */
unsigned short **maskRect; /* the mask accumulation must happen on canvas, not on space screen bucket.
* Here we store the mask rectangle */
bool **valid; /* store flag to enforce validation of undo rectangle */
@@ -197,7 +197,7 @@ typedef struct ProjPaintState {
Scene *scene;
int source; /* PROJ_SRC_**** */
- /* the paint color. It can change depending of interted mode or not */
+ /* the paint color. It can change depending of inverted mode or not */
float paint_color[3];
float paint_color_linear[3];
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index b060cda..33b2cdb 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -182,7 +182,7 @@ static void rna_Material_active_paint_texture_index_update(Main *bmain, Scene *s
Material *ma = ptr->id.data;
- if (BKE_scene_use_new_shading_nodes(scene) && ma->use_nodes && ma->nodetree) {
+ if (ma->use_nodes && ma->nodetree && BKE_scene_use_new_shading_nodes(scene)) {
struct bNode *node;
int index = 0;
for (node = ma->nodetree->nodes.first; node; node = node->next) {
More information about the Bf-blender-cvs
mailing list